[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: Lieven Govaerts <lgo_at_mobsol.be>
Date: 2006-02-10 22:39:53 CET

 
Matt,

> -----Original Message-----
> From: Matt England [mailto:mengland@mengland.net]
> Sent: vrijdag 10 februari 2006 22:30
> To: Lieven Govaerts
> Cc: 'Matthew England'; 'SVN Users email list'; 'Ryan Schmidt'
> Subject: RE: Can a merge follow changes in paths in trunk/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.

You can revert one or more revision by doing a reverse merge. Say you moved
branch/folder to branch/newfolder in revision 20, you checkout our branch
and do the reverse merge like this:
svn merge -r 20:19 http://srv/svn/branch/folder /wc-of-branch/
and then commit.

> 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.

Those things happen. Luckely, when you know Subversion well enough there's
always a way to solve even the most stupid mistake!

> 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:47:21 2006

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