Mercurial > public > mercurial-scm > hg-stable

diff mercurial/help/config.txt @ 34158:9e4f82bc2b0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
scmutil: don't append .orig to backups in origbackuppath (BC) When ui.origbackuppath is set, .orig files are stored outside of the working copy, however they still have a .orig suffix appended to them. This can cause unexpected conflicts, particularly when tracked files or directories have .orig at the end. This change removes the .orig suffix from files stored in an out-of-tree origbackuppath. Test Plan: Update and run unit tests. Differential Revision: https://phab.mercurial-scm.org/D679
author Mark Thomas <mbthomas@fb.com>
date Mon, 11 Sep 2017 17:49:49 +0000
parents da07367d683b
children a667f0ca1d5f
line wrap: on
line diff
--- a/mercurial/help/config.txt	Tue Sep 12 19:27:01 2017 -0700
+++ b/mercurial/help/config.txt	Mon Sep 11 17:49:49 2017 +0000
@@ -2007,7 +2007,9 @@
 
 ``origbackuppath``
     The path to a directory used to store generated .orig files. If the path is
-    not a directory, one will be created.
+    not a directory, one will be created.  If set, files stored in this
+    directory have the same name as the original file and do not have a .orig
+    suffix.
 
 ``paginate``
   Control the pagination of command output (default: True). See :hg:`help pager`