Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 26939:50d2389a2e49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: choose where .orig file locations are kept Having your working copy littered with .orig files is a common HG complaint. This patch uses the cmd.origpath helper function to let the user specify where they should be kept when using the resolve command.
author Christian Delahousse <cdelahousse@fb.com>
date Tue, 10 Nov 2015 14:26:19 -0800
parents 5f88e092f82c
children 216cc65cf227
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Nov 12 17:00:08 2015 -0600
+++ b/mercurial/commands.py	Tue Nov 10 14:26:19 2015 -0800
@@ -5678,7 +5678,7 @@
                 # for files in tocomplete, ms.resolve will not overwrite
                 # .orig -- only preresolve does
                 try:
-                    util.rename(a + ".resolve", a + ".orig")
+                    util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a))
                 except OSError as inst:
                     if inst.errno != errno.ENOENT:
                         raise