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

RE: Can a merge follow changes in paths in trunk/branch?

From: Matt England <mengland_at_mengland.net>
Date: 2006-02-10 22:36:45 CET

At 2/10/2006 03:29 PM, Matt England wrote:
>At 2/10/2006 03:10 PM, Lieven Govaerts wrote:
>> > Also, it's important to note that I goofed up my scenario
>> > example above. This is what we actually did:
>> >
>> > svn copy trunk/ branch/
>> > branch/folder/test.txt modified
>> > trunk/folder/test.txt modified
>> > trunk/folder/test.txt -- moved to -->
>> > trunk/newfolder/test.txt branch/folder/test.txt modified (in
>> > addition to above modification) trunk/newfolder/test.txt
>> > modified (in addition to above modification) # Right now the
>> > trunk and the branch won't merge, # presumably because they
>> > have a different directory layout (??)...
>> > # ...so we try making the same directory layout...
>> > branch/folder/test.txt -- moved to -->
>> > branch/newfolder/test.txt cd trunk/ # so that now both trunk/
>> > and branch/ now have the same dir structure, # but apparently
>> > that doesn't work, either, for some reason I don't yet #
>> > understand, but I'm still a young grasshopper wrt svn merge wisdom.
>> > svn merge -r M:N ../branch
>>
>>Or you could revert the revision in which you moved trunk/folder to
>>trunk/newfolder, then do the merge ( you may get a conflict on test.txt if
>>you both made changes on the same lines in the file ), and then reapply the
>>above revision?
>
>Yes...but how does one do this [a revert to a previous subverion repo
>state]?

Maybe you just mean a restore from backup of the repo? I suppose that's
another option; it may be the best one (besides using a non-svn merge
process...assuming we can get that to work).

-Matt

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 10 22:38:36 2006

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