test-mv-cp-st-diff: avoid linkrev collisions

The copy detection code relies heavily on the linkrevs, so it's better
to avoid collisions in this test.

tests/test-mv-cp-st-diff

@@ -1,63 +1,67 b''
 #!/bin/sh
 
 add()
 {
     echo $2 >> $1
 }
 
 hg init t
 cd t
 
 # set up a boring main branch
 add a a
 hg add a
 hg ci -m0
 
 add a m1
 hg ci -m1
 
 add a m2
 hg ci -m2
 
 show()
 {
     echo "- $2: $1"
     hg st -C $1
     echo
     hg diff --git $1
     echo
 }
 
+count=0
 # make a new branch and get diff/status output
 # $1 - first commit
 # $2 - second commit
 # $3 - working dir action
 # $4 - test description
 tb()
 {
     hg co -q -C 0
 
+    add a $count
+    count=`expr $count + 1`
+    hg ci -m "t0"
     $1
     hg ci -m "t1"
     $2
     hg ci -m "t2"
     $3
 
     echo "** $4 **"
     echo "** $1 / $2 / $3"
     show "" "working to parent"
     show "--rev 0" "working to root"
     show "--rev 2" "working to branch"
     show "--rev 0 --rev ." "root to parent"
     show "--rev . --rev 0" "parent to root"
     show "--rev 2 --rev ." "branch to parent"
     show "--rev . --rev 2" "parent to branch"
     echo
 }
 
 tb "add a a1" "add a a2" "hg mv a b" "rename in working dir"
 tb "add a a1" "add a a2" "hg cp a b" "copy in working dir" 
 tb "hg mv a b" "add b b1" "add b w" "single rename"
 tb "hg cp a b" "add b b1" "add a w" "single copy"
 tb "hg mv a b" "hg mv b c" "hg mv c d" "rename chain"
 tb "hg cp a b" "hg cp b c" "hg cp c d" "copy chain"

tests/test-mv-cp-st-diff.out

@@ -1,673 +1,795 b''
 ** rename in working dir **
 ** add a a1 / add a a2 / hg mv a b
 - working to parent: 
 A b
   a
 R a
 
 diff --git a/a b/b
 rename from a
 rename to b
 
 - working to root: --rev 0
 A b
   a
 R a
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
-@@ -1,1 +1,3 @@
+@@ -1,1 +1,4 @@
  a
++0
 +a1
 +a2
 
 - working to branch: --rev 2
 A b
   a
 R a
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
-@@ -1,3 +1,3 @@
+@@ -1,3 +1,4 @@
  a
 -m1
 -m2
++0
 +a1
 +a2
 
 - root to parent: --rev 0 --rev .
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,1 +1,3 @@
+@@ -1,1 +1,4 @@
  a
++0
 +a1
 +a2
 
 - parent to root: --rev . --rev 0
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,3 +1,1 @@
+@@ -1,4 +1,1 @@
  a
+-0
 -a1
 -a2
 
 - branch to parent: --rev 2 --rev .
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,3 +1,3 @@
+@@ -1,3 +1,4 @@
  a
 -m1
 -m2
++0
 +a1
 +a2
 
 - parent to branch: --rev . --rev 2
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,3 +1,3 @@
+@@ -1,4 +1,3 @@
  a
+-0
 -a1
 -a2
 +m1
 +m2
 
 
 ** copy in working dir **
 ** add a a1 / add a a2 / hg cp a b
 - working to parent: 
 A b
   a
 
 diff --git a/a b/b
 copy from a
 copy to b
 
 - working to root: --rev 0
 M a
 A b
   a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,1 +1,3 @@
+@@ -1,1 +1,4 @@
  a
++1
 +a1
 +a2
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
-@@ -1,1 +1,3 @@
+@@ -1,1 +1,4 @@
  a
++1
 +a1
 +a2
 
 - working to branch: --rev 2
 M a
 A b
   a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,3 +1,3 @@
+@@ -1,3 +1,4 @@
  a
 -m1
 -m2
++1
 +a1
 +a2
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
-@@ -1,3 +1,3 @@
+@@ -1,3 +1,4 @@
  a
 -m1
 -m2
++1
 +a1
 +a2
 
 - root to parent: --rev 0 --rev .
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,1 +1,3 @@
+@@ -1,1 +1,4 @@
  a
++1
 +a1
 +a2
 
 - parent to root: --rev . --rev 0
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,3 +1,1 @@
+@@ -1,4 +1,1 @@
  a
+-1
 -a1
 -a2
 
 - branch to parent: --rev 2 --rev .
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,3 +1,3 @@
+@@ -1,3 +1,4 @@
  a
 -m1
 -m2
++1
 +a1
 +a2
 
 - parent to branch: --rev . --rev 2
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,3 +1,3 @@
+@@ -1,4 +1,3 @@
  a
+-1
 -a1
 -a2
 +m1
 +m2
 
 
 ** single rename **
 ** hg mv a b / add b b1 / add b w
 - working to parent: 
 M b
 
 diff --git a/b b/b
 --- a/b
 +++ b/b
-@@ -1,2 +1,3 @@
+@@ -1,3 +1,4 @@
  a
+ 2
  b1
 +w
 
 - working to root: --rev 0
 A b
   a
 R a
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
-@@ -1,1 +1,3 @@
+@@ -1,1 +1,4 @@
  a
++2
 +b1
 +w
 
 - working to branch: --rev 2
 A b
   a
 R a
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
-@@ -1,3 +1,3 @@
+@@ -1,3 +1,4 @@
  a
 -m1
 -m2
++2
 +b1
 +w
 
 - root to parent: --rev 0 --rev .
 A b
   a
 R a
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
-@@ -1,1 +1,2 @@
+@@ -1,1 +1,3 @@
  a
++2
 +b1
 
 - parent to root: --rev . --rev 0
 A a
   b
 R b
 
 diff --git a/b b/a
 rename from b
 rename to a
 --- a/b
 +++ b/a
-@@ -1,2 +1,1 @@
+@@ -1,3 +1,1 @@
  a
+-2
 -b1
 
 - branch to parent: --rev 2 --rev .
 A b
   a
 R a
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
-@@ -1,3 +1,2 @@
+@@ -1,3 +1,3 @@
  a
 -m1
 -m2
++2
 +b1
 
 - parent to branch: --rev . --rev 2
 A a
   b
 R b
 
 diff --git a/b b/a
 rename from b
 rename to a
 --- a/b
 +++ b/a
-@@ -1,2 +1,3 @@
+@@ -1,3 +1,3 @@
  a
+-2
 -b1
 +m1
 +m2
 
 
 ** single copy **
 ** hg cp a b / add b b1 / add a w
 - working to parent: 
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,1 +1,2 @@
+@@ -1,2 +1,3 @@
  a
+ 3
 +w
 
 - working to root: --rev 0
 M a
 A b
   a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,1 +1,2 @@
+@@ -1,1 +1,3 @@
+ a
++3
++w
+diff --git a/a b/b
+copy from a
+copy to b
+--- a/a
++++ b/b
+@@ -1,1 +1,3 @@
  a
++3
++b1
+
+- working to branch: --rev 2
+M a
+A b
+  a
+
+diff --git a/a b/a
+--- a/a
++++ b/a
+@@ -1,3 +1,3 @@
+ a
+-m1
+-m2
++3
 +w
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
+@@ -1,3 +1,3 @@
+ a
+-m1
+-m2
++3
++b1
+
+- root to parent: --rev 0 --rev .
+M a
+A b
+  a
+
+diff --git a/a b/a
+--- a/a
++++ b/a
 @@ -1,1 +1,2 @@
  a
++3
+diff --git a/a b/b
+copy from a
+copy to b
+--- a/a
++++ b/b
+@@ -1,1 +1,3 @@
+ a
++3
 +b1
 
-- working to branch: --rev 2
+- parent to root: --rev . --rev 0
+M a
+R b
+
+diff --git a/a b/a
+--- a/a
++++ b/a
+@@ -1,2 +1,1 @@
+ a
+-3
+diff --git a/b b/b
+deleted file mode 100644
+--- a/b
++++ /dev/null
+@@ -1,3 +0,0 @@
+-a
+-3
+-b1
+
+- branch to parent: --rev 2 --rev .
 M a
 A b
   a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
-+w
-diff --git a/a b/b
-copy from a
-copy to b
---- a/a
-+++ b/b
-@@ -1,3 +1,2 @@
- a
--m1
--m2
-+b1
-
-- root to parent: --rev 0 --rev .
-A b
-  a
-
++3
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
-@@ -1,1 +1,2 @@
- a
-+b1
-
-- parent to root: --rev . --rev 0
-R b
-
-diff --git a/b b/b
-deleted file mode 100644
---- a/b
-+++ /dev/null
-@@ -1,2 +0,0 @@
--a
--b1
-
-- branch to parent: --rev 2 --rev .
-M a
-A b
-  a
-
-diff --git a/a b/a
---- a/a
-+++ b/a
-@@ -1,3 +1,1 @@
+@@ -1,3 +1,3 @@
  a
 -m1
 -m2
-diff --git a/a b/b
-copy from a
-copy to b
---- a/a
-+++ b/b
-@@ -1,3 +1,2 @@
- a
--m1
--m2
++3
 +b1
 
 - parent to branch: --rev . --rev 2
 M a
 R b
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,1 +1,3 @@
+@@ -1,2 +1,3 @@
  a
+-3
 +m1
 +m2
 diff --git a/b b/b
 deleted file mode 100644
 --- a/b
 +++ /dev/null
-@@ -1,2 +0,0 @@
+@@ -1,3 +0,0 @@
 -a
+-3
 -b1
 
 
 ** rename chain **
 ** hg mv a b / hg mv b c / hg mv c d
 - working to parent: 
 A d
   c
 R c
 
 diff --git a/c b/d
 rename from c
 rename to d
 
 - working to root: --rev 0
 A d
   a
 R a
 
 diff --git a/a b/d
 rename from a
 rename to d
+--- a/a
++++ b/d
+@@ -1,1 +1,2 @@
+ a
++4
 
 - working to branch: --rev 2
 A d
   a
 R a
 
 diff --git a/a b/d
 rename from a
 rename to d
 --- a/a
 +++ b/d
-@@ -1,3 +1,1 @@
+@@ -1,3 +1,2 @@
  a
 -m1
 -m2
++4
 
 - root to parent: --rev 0 --rev .
 A c
   a
 R a
 
 diff --git a/a b/c
 rename from a
 rename to c
+--- a/a
++++ b/c
+@@ -1,1 +1,2 @@
+ a
++4
 
 - parent to root: --rev . --rev 0
 A a
   c
 R c
 
 diff --git a/c b/a
 rename from c
 rename to a
+--- a/c
++++ b/a
+@@ -1,2 +1,1 @@
+ a
+-4
 
 - branch to parent: --rev 2 --rev .
 A c
   a
 R a
 
 diff --git a/a b/c
 rename from a
 rename to c
 --- a/a
 +++ b/c
-@@ -1,3 +1,1 @@
+@@ -1,3 +1,2 @@
  a
 -m1
 -m2
++4
 
 - parent to branch: --rev . --rev 2
 A a
   c
 R c
 
 diff --git a/c b/a
 rename from c
 rename to a
 --- a/c
 +++ b/a
-@@ -1,1 +1,3 @@
+@@ -1,2 +1,3 @@
  a
+-4
 +m1
 +m2
 
 
 ** copy chain **
 ** hg cp a b / hg cp b c / hg cp c d
 - working to parent: 
 A d
   c
 
 diff --git a/c b/d
 copy from c
 copy to d
 
 - working to root: --rev 0
+M a
 A b
   a
 A c
   a
 A d
   a
 
+diff --git a/a b/a
+--- a/a
++++ b/a
+@@ -1,1 +1,2 @@
+ a
++5
 diff --git a/a b/b
 copy from a
 copy to b
+--- a/a
++++ b/b
+@@ -1,1 +1,2 @@
+ a
++5
 diff --git a/a b/c
 copy from a
 copy to c
+--- a/a
++++ b/c
+@@ -1,1 +1,2 @@
+ a
++5
 diff --git a/a b/d
 copy from a
 copy to d
+--- a/a
++++ b/d
+@@ -1,1 +1,2 @@
+ a
++5
 
 - working to branch: --rev 2
 M a
 A b
   a
 A c
   a
 A d
   a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,3 +1,1 @@
+@@ -1,3 +1,2 @@
  a
 -m1
 -m2
++5
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
-@@ -1,3 +1,1 @@
+@@ -1,3 +1,2 @@
  a
 -m1
 -m2
++5
 diff --git a/a b/c
 copy from a
 copy to c
 --- a/a
 +++ b/c
-@@ -1,3 +1,1 @@
+@@ -1,3 +1,2 @@
  a
 -m1
 -m2
++5
 diff --git a/a b/d
 copy from a
 copy to d
 --- a/a
 +++ b/d
-@@ -1,3 +1,1 @@
+@@ -1,3 +1,2 @@
  a
 -m1
 -m2
++5
 
 - root to parent: --rev 0 --rev .
+M a
 A b
   a
 A c
   a
 
+diff --git a/a b/a
+--- a/a
++++ b/a
+@@ -1,1 +1,2 @@
+ a
++5
 diff --git a/a b/b
 copy from a
 copy to b
+--- a/a
++++ b/b
+@@ -1,1 +1,2 @@
+ a
++5
 diff --git a/a b/c
 copy from a
 copy to c
+--- a/a
++++ b/c
+@@ -1,1 +1,2 @@
+ a
++5
 
 - parent to root: --rev . --rev 0
+M a
 R b
 R c
 
+diff --git a/a b/a
+--- a/a
++++ b/a
+@@ -1,2 +1,1 @@
+ a
+-5
 diff --git a/b b/b
 deleted file mode 100644
 --- a/b
 +++ /dev/null
-@@ -1,1 +0,0 @@
+@@ -1,2 +0,0 @@
 -a
+-5
 diff --git a/c b/c
 deleted file mode 100644
 --- a/c
 +++ /dev/null
-@@ -1,1 +0,0 @@
+@@ -1,2 +0,0 @@
 -a
+-5
 
 - branch to parent: --rev 2 --rev .
 M a
 A b
   a
 A c
   a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,3 +1,1 @@
+@@ -1,3 +1,2 @@
  a
 -m1
 -m2
++5
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
-@@ -1,3 +1,1 @@
+@@ -1,3 +1,2 @@
  a
 -m1
 -m2
++5
 diff --git a/a b/c
 copy from a
 copy to c
 --- a/a
 +++ b/c
-@@ -1,3 +1,1 @@
+@@ -1,3 +1,2 @@
  a
 -m1
 -m2
++5
 
 - parent to branch: --rev . --rev 2
 M a
 R b
 R c
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
-@@ -1,1 +1,3 @@
+@@ -1,2 +1,3 @@
  a
+-5
 +m1
 +m2
 diff --git a/b b/b
 deleted file mode 100644
 --- a/b
 +++ /dev/null
-@@ -1,1 +0,0 @@
+@@ -1,2 +0,0 @@
 -a
+-5
 diff --git a/c b/c
 deleted file mode 100644
 --- a/c
 +++ /dev/null
-@@ -1,1 +0,0 @@
+@@ -1,2 +0,0 @@
 -a
+-5