[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Accidental check-in on wrong branch
|
From: |
Jordi Gutiérrez Hermoso |
|
Subject: |
Re: Accidental check-in on wrong branch |
|
Date: |
Mon, 6 Jun 2011 12:49:33 -0500 |
On 6 June 2011 11:39, Rik <address@hidden> wrote:
> I accidentally checked in the following two changesets on 'stable' rather
> than 'default':
[...]
> 12699:c0d102ad9bba
> Fix loading of objects in MAT-files (bug #32641).
This one is on default. It's just the other changeset that is on stable.
> I think it would be possible to export the changes as patches, use patch
> -R to apply them in reverse, and then check in the undone files on the
> stable branch.
The hg backout command does exactly this. I've taken the liberty to
backout the change from stable, and when merging, I re-applied
12700:9843b3b055e0 over the merge before committing.
HTH,
- Jordi G. H.