view tests/test-diff-color.out @ 11063:eb23c876c111

tag: warn users about tag/branch possible name conflicts

As reported recently, Mercurial users can easily find confusion when
using a common name for a tag and a branch. It seems reasonable to warn
them about this potential outcome, to avoid that "surprise".
* Explain briefly the issue in "hg help tag"
* Warn when tagging a revision

adding a
% default context
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -2,7 +2,7 @@
 c
 a
 a
-b
+dd
 a
 a
 c
% --unified=2
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -3,5 +3,5 @@
 a
 a
-b
+dd
 a
 a
% diffstat
 a |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
% record
diff --git a/a b/a
old mode 100644
new mode 100755
1 hunks, 2 lines changed
examine changes to 'a'? [Ynsfdaq?] 
@@ -2,7 +2,7 @@
 c
 a
 a
-b
+dd
 a
 a
 c
record this change to 'a'? [Ynsfdaq?] 

rolling back to revision 1 (undo commit)
% qrecord
diff --git a/a b/a
old mode 100644
new mode 100755
1 hunks, 2 lines changed
examine changes to 'a'? [Ynsfdaq?] 
@@ -2,7 +2,7 @@
 c
 a
 a
-b
+dd
 a
 a
 c
record this change to 'a'? [Ynsfdaq?]