subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Raja Gopal Chowdary Nutheti <rgchowdar...@gmail.com>
Subject caveat in re-parenting
Date Tue, 05 Jul 2011 07:23:13 GMT
I tried the following merge command to re-parent a branch-B to Trunk from
another branch-A [ branch B is just copy of A], but the merge command
deleting the files which are added to A as part of other child branch
collapses.



svn merge --accept 'postpone' ^/branches/A ^/trunk@HEAD







So to avoid vanishing the branch B content i have  used the following merge
command to proceed further .



svn merge --accept 'postpone' ^/trunk@<previous merge point to A>
^/trunk@HEAD

Some one help me on this ?
-- 
Best Regards,
Raja.

Mime
View raw message