[PATCH 2 of 3 V2] subrepo: make submerge() return the merged substate

[Angel Ezquerra]

# HG changeset patch
# User Angel Ezquerra <angel.ezquerra at 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 --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -237,6 +237,7 @@
 
     # record merged .hgsubstate
     writestate(repo, sm)
+    return sm
 
 def _updateprompt(ui, sub, dirty, local, remote):
     if dirty:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: hg-2.4-2.patch
Type: text/x-patch
Size: 650 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130821/879966b0/attachment.bin>