Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 24390:72d7d390ef5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch._applydiff: resolve prefix with respect to the cwd This has several advantages compared to resolving it relative to the root: - '--prefix .' works as expected. - consistent with upcoming 'hg diff' option to produce relative patches (I made sure to put in the (glob) annotations this time!)
author Siddharth Agarwal <sid0@fb.com>
date Thu, 19 Mar 2015 10:18:05 -0700
parents f1eaf03dd608
children d0ea2028e8e6
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Mar 20 00:22:37 2015 +0900
+++ b/mercurial/commands.py	Thu Mar 19 10:18:05 2015 -0700
@@ -4066,7 +4066,7 @@
     ('', 'exact', None,
      _('apply patch to the nodes from which it was generated')),
     ('', 'prefix', '',
-     _('apply patch to directory relative to the root'), _('DIR')),
+     _('apply patch to subdirectory'), _('DIR')),
     ('', 'import-branch', None,
      _('use any branch information in patch (implied by --exact)'))] +
     commitopts + commitopts2 + similarityopts,