Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 6432:b1204fd06c2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 31 Mar 2008 21:49:26 -0500
parents 7c36aee46bf5 fb374b1b3911
children fa5454a451c6
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Mar 31 18:49:15 2008 +0200
+++ b/mercurial/commands.py	Mon Mar 31 21:49:26 2008 -0500
@@ -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