Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 6438:a60b711c7ac4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with hg-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 01 Apr 2008 08:33:17 +0200
parents b8346ae5d64b fb374b1b3911
children fa5454a451c6 65029a3aafc2
line wrap: on
line diff
--- a/mercurial/commands.py	Sun Mar 30 23:58:02 2008 +0200
+++ b/mercurial/commands.py	Tue Apr 01 08:33:17 2008 +0200
@@ -227,7 +227,10 @@
             raise util.Abort(_('cannot use --parent on non-merge changeset'))
         parent = p1
 
+    # the backout should appear on the same branch
+    branch = repo.dirstate.branch()
     hg.clean(repo, node, show_stats=False)
+    repo.dirstate.setbranch(branch)
     revert_opts = opts.copy()
     revert_opts['date'] = None
     revert_opts['all'] = True