mercurial: comparison tests/test-annotate.t

equal deleted inserted replaced

-:5c4e2636c1a9
+:8c0c75aa3ff4
 $ hg ci -mb2 -d '2 0'
 annotate -n b
 $ hg annotate -n b
+1: a
 0: a
-1: a
 1: a
 3: b4
 3: b5
 3: b6
 3: b6
 annotate -nl b
 $ hg annotate -nl b
+1:1: a
 0:1: a
-1:2: a
 1:3: a
 3:4: b4
 3:5: b5
 3:6: b6
 annotate -nf b
 $ hg annotate -nf b
+1 a: a
 0 a: a
-1 a: a
 1 a: a
 3 b: b4
 3 b: b5
 3 b: b6
 annotate -nlf b
 $ hg annotate -nlf b
+1 a:1: a
 0 a:1: a
-1 a:2: a
 1 a:3: a
 3 b:4: b4
 3 b:5: b5
 3 b:6: b6
 $ hg ci -mmergeb -d '3 0'
 annotate after merge
 $ hg annotate -nf b
+1 a: a
 0 a: a
-1 a: a
 1 a: a
 3 b: b4
 4 b: c
 3 b: b5
 annotate after merge with -l
 $ hg annotate -nlf b
+1 a:1: a
 0 a:1: a
-1 a:2: a
 1 a:3: a
 3 b:4: b4
 4 b:5: c
 3 b:5: b5
 $ hg ci -mmerge2 -d '4 0'
 annotate after rename merge
 $ hg annotate -nf b
-0 a: a
+1 a: a
 6 b: z
 1 a: a
 3 b: b4
 4 b: c
 3 b: b5
 7 b: d
 annotate after rename merge with -l
 $ hg annotate -nlf b
-0 a:1: a
+1 a:1: a
 6 b:2: z
 1 a:3: a
 3 b:4: b4
 4 b:5: c
 3 b:5: b5
 $ echo more >> b
 $ hg ci -mmore -d '6 0'
 $ echo more >> b
 $ hg ci -mmore -d '7 0'
 $ hg annotate -nlf b
-0 a: 1: a
+1 a: 1: a
 6 b: 2: z
 1 a: 3: a
 3 b: 4: b4
 4 b: 5: c
 3 b: 5: b5
 10 b:10: more
 linkrev vs rev
 $ hg annotate -r tip -n a
+1: a
 0: a
 1: a
-1: a
 linkrev vs rev with -l
 $ hg annotate -r tip -nl a
+1:1: a
 0:1: a
-1:2: a
 1:3: a
 Issue589: "undelete" sequence leads to crash
 annotate was crashing when trying to --follow something