Mercurial > hg

changeset 19637:cc338115d3b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: make submerge() return the merged substate This will be useful when reusing submerge() to improve the handling of subrepos on mq. # HG changeset patch # User Angel Ezquerra <angel.ezquerra@gmail.com> # Date 1377117244 -7200 # Wed Aug 21 22:34:04 2013 +0200 # Node ID 2defb5453f223c3027eb2f7788fbddd52bbb3352 # Parent a5c90acff5e61aae714ba6c9457d766c54b4f124 subrepo: make submerge() return the merged substate This will be useful when reusing submerge() to improve the handling of subrepos on mq.
author Angel Ezquerra <angel.ezquerra@gmail.com>
date Wed, 21 Aug 2013 22:34:04 +0200
parents 6bbce5efc67b
children 20096384754f
files mercurial/subrepo.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/subrepo.py	Tue Aug 06 00:49:39 2013 +0200
+++ b/mercurial/subrepo.py	Wed Aug 21 22:34:04 2013 +0200
@@ -237,6 +237,7 @@
 
     # record merged .hgsubstate
     writestate(repo, sm)
+    return sm
 
 def _updateprompt(ui, sub, dirty, local, remote):
     if dirty: