# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1377117244 -7200
# Node ID cc338115d3b2152c8ebb42146f5b72b2cda75a1a
# Parent  6bbce5efc67b6d510f189836b25f8f350c7a47c7
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.

diff -r 6bbce5efc67b -r cc338115d3b2 mercurial/subrepo.py
--- 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: