Merge problem after changing directory tree structure

[Derek Mahar <DM...@penson.ca>]

How do I merge branch changes to the trunk after I change the directory
structure at a point above the branch and trunk directories?  For
example, consider the following directory-tree revision history in which
I rename an ancestor directory:
 
Revision 1:
Initial import
a/branches/
a/trunk
 
Revision 2:
Create branch1 (copy /a/trunk/ to /a/branch1).
a/branches/branch1
a/trunk
 
Revision 3:
Add a/branch1/a.txt.
a/branches/branch1/
a/branches/branch1/a.txt
a/trunk
 
Revision 4:
Rename directory a to b.
b/branches/branch1
b/branches/branch1/a.txt
b/trunk
 
How do I now merge the changes to b/branches/branch1 in revision 3 to
b/trunk so that I get b/trunk/a.txt?  If I specify b/branches/branch1 at
revision 3 as the merge source revision, Subversion complains that
b/branches/branch1 does not exist in revision 3.  Is there a workaround
to this problem?
 
Thank you,
 
Derek

NOTICE: This email contains privileged and confidential information and is intended only for the individual to whom it is addressed. If you are not the named addressee, you should not disseminate, distribute or copy this e-mail. Please notify the sender immediately by e-mail if you have received this transmission by mistake and delete this communication from your system. E-mail transmission cannot be guaranteed to be secured or error-free as information could be intercepted, corrupted, lost, destroyed, arrive late or incomplete, or contain viruses. 

AVIS: Le pr�sent courriel contient des renseignements de nature privil�gi�e et confidentielle et n�est destin� qu'� la personne � qui il est adress�. Si vous n��tes pas le destinataire pr�vu, vous �tes par les pr�sentes avis�s que toute diffusion, distribution ou reproduction de cette communication est strictement interdite.� Si vous avez re�u ce courriel par erreur, veuillez en aviser imm�diatement l�exp�diteur et le supprimer de votre syst�me. Notez que la transmission de courriel ne peut en aucun cas �tre consid�r� comme inviolable ou exempt d�erreur puisque les informations qu�il contient pourraient �tre intercept�s, corrompues, perdues, d�truites, arriv�es en retard ou incompl�tes ou contenir un virus. �

Re: Merge problem after changing directory tree structure

[Ben Collins-Sussman <su...@collab.net>]

Derek Mahar wrote:

> How do I now merge the changes to b/branches/branch1 in revision 3 to 
> b/trunk so that I get b/trunk/a.txt?  If I specify b/branches/branch1 at 
> revision 3 as the merge source revision, Subversion complains that 
> b/branches/branch1 does not exist in revision 3.  Is there a workaround 
> to this problem?

Sure:  don't compare repository roots.  Compare subtrees instead.

In your case, assuming you have a working copy of /b/trunk in local 
directory "wc", you'd run

     svn merge -r2:3 schema://.../a/branches/branch1 wc




---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org