[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:29:36 CET

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? I don't see how one can go back in time
with Subversion; 'svn obliterate' hasn't been implemented yet. If one
moves dirs around again, we seem to get the problems we've had before.

And for what it's worth: we researched branching-and-merging for several
weeks before implementing it; I believe we weren't total rookies going into
this, for what it's worth. And we've had a growing team of people using
Subversion for about 8 months prior before doing this merge; it's not like
we just picked up and started using it within the last month. One
challenge is that one developer got a little trigger-happy (outside our
designated direction) and started to do some more directory-layout-reorg
work before we merged our branch, did some more changes, and now we have
diverged too much...but we didn't think we'd have that much problem if it's
a straight file-and-path compare. Unfortunately, it's not, and now we're
in a state where I can't use subversion anymore to merge...unless there are
alternatives that I haven't seen yet.

And yes, we have email notifications for all our commits (to try and catch
these rogue changes)...I just wasn't paying close enough attention to what
was going on when it happened. But again, I ask: how does one revert
committed changes? Where/how is this magic done?

Thanks for the support contact info.

-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:31:08 2006

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