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

Re: Reverting changes from merged revisions

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 10 Mar 2011 22:08:01 +0100

On 08.03.2011 16:17, Josha wrote:
> I am having a problem running "Revert changes from this revision" on a
> merged revision with TSVN 1.6.13.
>
> So, for example in TSVN, on the 1.6.x branch, follow these steps:
>
> 1. Open up the log dialog from a WC.
> 2. Check "Include merged revisions".
> 3. Scroll down to revision 20347, it is under 20441.
> 4. Right click on 20347 and select "Revert changes from this
> revision".
> 5. Click Yes.
>
> The output is this:
> Command: Merging revisions 20347-20346 of http://tortoisesvn.googlecode.com/svn/branches/1.6.x
> into C:\Temp\TSVN, respecting ancestry
> C:\Temp\TSVN
> Finished!
>
> No changes are merged. I assume it is because the changes were on
> trunk and it is trying to merge changes from the branch.

You can only revert changes in the log dialog that were actually applied
to the wc. The 'merged revisions' that are shown are not applied but
only referenced.
To do such a revert, you'd have to revert revision 20441 instead.

> Hmm, it looks like if I use the Merge dialog and select the revision
> directly from trunk, the reverse merge option works. Is there any way
> to make "Revert changes from this revision" work in this situation?
> It would be a lot easier that way.

That merge 'knows' the source of the merge (the trunk url) so it works.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2710732
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-03-10 22:08:11 CET

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