Patchwork [2,of,4] rebase: document that tool dos not apply to deleted files

login
register
mail settings
Submitter timeless@mozdev.org
Date Feb. 5, 2016, 2:09 a.m.
Message ID <3d51044735f6858f85f0.1454638183@waste.org>
Download mbox | patch
Permalink /patch/12995/
State Accepted
Headers show

Comments

timeless@mozdev.org - Feb. 5, 2016, 2:09 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1454628572 0
#      Thu Feb 04 23:29:32 2016 +0000
# Node ID 3d51044735f6858f85f0d32df9c03642cdbc7e55
# Parent  8f7715647fb5acbda814fc5fc2ba99d0dc4c4c07
rebase: document that tool dos not apply to deleted files
timeless - Feb. 5, 2016, 2:54 a.m.
timeless wrote:
> rebase: document that tool dos not apply to deleted files

oops, s/dos/does/

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -157,6 +157,8 @@ 
 
     If you need to use a tool to automate merge/conflict decisions, you
     can specify one with ``--tool``, see :hg:`help merge-tools`.
+    As a caveat: the tool will not be used to mediate when a file was
+    deleted, there is no hook presently available for this.
 
     If a rebase is interrupted to manually resolve a conflict, it can be
     continued with --continue/-c or aborted with --abort/-a.