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

Re: Branching question

From: Hari Kodungallur <hkodungallur_at_gmail.com>
Date: 2007-11-15 18:36:31 CET

On Nov 15, 2007 8:40 AM, Jeff Lanzarotta <delux256-subversion@yahoo.com>
wrote:

> Interesting... What if I need to go back 4 revisions... The current
> revision number is 195 and revision I need to get to is 162...
>
> Do I need to so an "unmerge" for each revision, i.e. unmerge 195, unmerge
> 193, unmerge 191, and unmerge 187, which will get me to 162?

No, you don't need to individually unmerge each revision. Update your
working copy of the trunk to the latest and then just execute this command
in that directory:

    svn merge -rHEAD:163 <trunk-repository-url>

This will reverse merge all the revision and get you back to where you were
at revision 162. Just verify (using svn diff and such) that the merge did
indeed merge back all the changes from 163 to 195 (or HEAD) and commit the
changes.

I prefer this method to getting a copy of the trunk at revision 162 and then
overlaying the working copy with it.

>
>
> *"Reedick, Andrew" <jr9445@ATT.COM>* wrote:
>
>
> > From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
> > Sent: Thursday, November 15, 2007 10:21 AM
> > To: Subversion Mailing List
> > Subject: Branching question
> >
> > I currently have a file, let's say foo.exe, checked into an svn
> > repository. My repository is set up with the typical trunk,
> > branches, and tags layout. The file foo.exe is checked into
> > the trunk. foo.exe has several revision against it, 1, 2, and
> > 3 with 3 being the HEAD.
> >
> > Here is the question, can I move revisions 2 and 3 into a branch
> > and make 1 the HEAD again? The powers at be do not want the
> > changes that are in revisions 2 and 3 until sometime next year,
> > so they want revert back to revision 1 as the HEAD. Is this
> > possible or is there a different way to do it...
>
>
> 1. Create next_year_branch from revision 3.
>
> 2. On the trunk, unmerge (do a reverse merge) revisions 2 and 3. Refer
> to "Undoing Changes" in
> http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html
>
>

Regards,
-Hari Kodungallur
Received on Thu Nov 15 18:39:16 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.