log mercurial/subrepo.py @ 20108:af12f58e2aa0

age author description
Mon, 25 Nov 2013 16:15:44 -0600 Matt Mackall merge with stable
Mon, 25 Nov 2013 13:50:36 -0600 Matt Mackall subrepo: sanitize non-hg subrepos stable
Wed, 06 Nov 2013 18:19:04 -0500 Augie Fackler pathutil: tease out a new library to break an import cycle from canonpath use
Fri, 06 Sep 2013 00:38:28 +0200 Angel Ezquerra merge: let the user choose to merge, keep local or keep remote subrepo revisions
Fri, 20 Sep 2013 10:15:37 -0400 Augie Fackler subrepo: move import of xml.minidom.dom to its own line for check-code
Wed, 21 Aug 2013 22:34:04 +0200 Angel Ezquerra subrepo: make submerge() return the merged substate
Wed, 22 May 2013 17:31:43 -0500 Matt Mackall ui: merge prompt text components into a singe string