Mercurial > public > mercurial-scm > hg

diff mercurial/subrepo.py @ 26940:91786f20db83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
git-subrepos: revert respects specified location to save .orig files This patch makes revert in git subrepos save .orig files where the user wants them by using the cmdutil.origpath function.
author Christian Delahousse <cdelahousse@fb.com>
date Tue, 10 Nov 2015 14:29:13 -0800
parents 1aee2ab0f902
children 07fc2f2134ba
line wrap: on
line diff
--- a/mercurial/subrepo.py	Tue Nov 10 14:26:19 2015 -0800
+++ b/mercurial/subrepo.py	Tue Nov 10 14:29:13 2015 -0800
@@ -1910,7 +1910,7 @@
             status = self.status(None)
             names = status.modified
             for name in names:
-                bakname = "%s.orig" % name
+                bakname = cmdutil.origpath(self.ui, self._subparent, name)
                 self.ui.note(_('saving current version of %s as %s\n') %
                         (name, bakname))
                 self.wvfs.rename(name, bakname)