[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: Reedick, Andrew <jr9445_at_ATT.COM>
Date: 2007-11-15 18:17:30 CET

svn merge supports ranges: svn merge -r 195:163 ...
If you have doubts about whether the unmerge worked, then grab a copy of
each version and diff them.
    1. create a workspace
    2. run the reverse merge in the workspace
    3. svn export .../foo.exe HEAD.exe
    4. svn export -r 162 .../foo.exe 162.exe
    5. windows: fc /b HEAD.exe 162.exe
            unix: cmp HEAD.exe 162.exe
    6. If satisfied, then 'svn ci'


        From: Jeff Lanzarotta [mailto:delux256-subversion@yahoo.com]
        Sent: Thursday, November 15, 2007 11:40 AM
        To: Reedick, Andrew; Subversion Mailing List
        Subject: RE: Branching question
        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
        "Reedick, Andrew" <jr9445@ATT.COM> wrote:

> From: Jeff Lanzarotta
> 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
> branches, and tags layout. The file foo.exe is checked
> 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
> 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
                To unsubscribe, e-mail:
                For additional commands, e-mail:


The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA621
Received on Thu Nov 15 18:18:49 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.