Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 26641:5c57d01fe64e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
destupdate: also include bookmark related logic For the same reason, we move the bookmark related update logic into the 'destupdate' function. This requires to extend the returns of the function to include the bookmark that needs to move (more or less) and the bookmark to activate at the end of the function. See function documentation for details on this returns.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 29 Sep 2015 01:03:26 -0700
parents 8e6d5b7317e6
children f618b6aa8cdd
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Oct 13 10:57:54 2015 -0700
+++ b/mercurial/merge.py	Tue Sep 29 01:03:26 2015 -0700
@@ -1027,7 +1027,8 @@
             pas = [repo[ancestor]]
 
         if node is None:
-            node = repo[destutil.destupdate(repo)].node()
+            rev, _mark, _act = destutil.destupdate(repo)
+            node = repo[rev].node()
 
         overwrite = force and not branchmerge