Mercurial > hg > gitweb

diff mercurial/commands.py @ 4445:af8db3b42a4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make hg import --exact work when a new branch is created by an import.
author Eric Hopper <hopper@omnifarious.org>
date Thu, 17 May 2007 20:09:52 -0700
parents eff2eefdb65a
children 8fa54b9c6c5a
line wrap: on
line diff
--- a/mercurial/commands.py	Thu May 17 20:09:49 2007 -0700
+++ b/mercurial/commands.py	Thu May 17 20:09:52 2007 -0700
@@ -1547,6 +1547,7 @@
                 if p1 != wp[0].node():
                     hg.clean(repo, p1, wlock=wlock)
                 repo.dirstate.setparents(p1, p2)
+                repo.dirstate.setbranch(branch or 'default')
             elif p2:
                 try:
                     p1 = repo.lookup(p1)