RE: Undoing changes cherry picked over from another branch.

> I have a situation where I had a branch of main, where a number of
> changes where done - lets say 3 changes and each change effect a number
> of files.
>
> On completion of said branch it was merged back into main. It was later
> decided that these 3 fixes were desired in in another release so they
> were 'cherry pick' merged across into this release.
>
> That is where we are now.
>
> BUT I want to remove 1 of the original 3 fixes. Can anyone advise how
> best to do this? I tried to generate a patch for the fixes - thinking i
> could 'throw it into reverse' and remove those changes but i cant see
> obvious button to do this.
>
> All help gratefully received!
>

Since the merge is committed as one changeset I think you will have to go back to your branch, do a reverse merge of that revision on branch. Once that is done merge that change into your other two locations.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2368434

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-07-06 18:31:20 CEST