[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

caveat in re-parenting

From: Raja Gopal Chowdary Nutheti <rgchowdary.n_at_gmail.com>
Date: Tue, 5 Jul 2011 12:53:13 +0530

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_at_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_at_HEAD

Some one help me on this ?

-- 
Best Regards,
Raja.
Received on 2011-07-05 10:42:16 CEST

This is an archived mail posted to the Subversion Users mailing list.