Show More
@@ -1,73 +1,76 | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | echo % init |
|
4 | 4 | hg init |
|
5 | 5 | |
|
6 | 6 | echo % commit |
|
7 | 7 | echo 'a' > a |
|
8 | 8 | hg ci -A -m test -u nobody -d '1 0' |
|
9 | 9 | |
|
10 | 10 | echo % annotate -c |
|
11 | 11 | hg annotate -c a |
|
12 | 12 | |
|
13 | 13 | echo % annotate -d |
|
14 | 14 | hg annotate -d a |
|
15 | 15 | |
|
16 | 16 | echo % annotate -n |
|
17 | 17 | hg annotate -n a |
|
18 | 18 | |
|
19 | 19 | echo % annotate -u |
|
20 | 20 | hg annotate -u a |
|
21 | 21 | |
|
22 | 22 | echo % annotate -cdnu |
|
23 | 23 | hg annotate -cdnu a |
|
24 | 24 | |
|
25 | 25 | cat <<EOF >>a |
|
26 | 26 | a |
|
27 | 27 | a |
|
28 | 28 | EOF |
|
29 | 29 | hg ci -ma1 -d '1 0' |
|
30 | 30 | hg cp a b |
|
31 | 31 | hg ci -mb -d '1 0' |
|
32 | 32 | cat <<EOF >> b |
|
33 | 33 | b |
|
34 | 34 | b |
|
35 | 35 | b |
|
36 | 36 | EOF |
|
37 | 37 | hg ci -mb2 -d '2 0' |
|
38 | 38 | |
|
39 | 39 | echo % annotate b |
|
40 | 40 | hg annotate b |
|
41 | 41 | echo % annotate -nf b |
|
42 | 42 | hg annotate -nf b |
|
43 | 43 | |
|
44 | 44 | hg up -C 2 |
|
45 | 45 | cat <<EOF >> b |
|
46 | 46 | b |
|
47 | 47 | c |
|
48 | 48 | b |
|
49 | 49 | EOF |
|
50 | 50 | hg ci -mb2.1 -d '2 0' |
|
51 | 51 | hg merge |
|
52 | 52 | hg ci -mmergeb -d '3 0' |
|
53 | 53 | echo % annotate after merge |
|
54 | 54 | hg annotate -nf b |
|
55 | 55 | |
|
56 | 56 | hg up -C 1 |
|
57 | 57 | hg cp a b |
|
58 | 58 | cat <<EOF > b |
|
59 | 59 | a |
|
60 | 60 | z |
|
61 | 61 | a |
|
62 | 62 | EOF |
|
63 | 63 | hg ci -mc -d '3 0' |
|
64 | 64 | hg merge |
|
65 | 65 | cat <<EOF >> b |
|
66 | 66 | b |
|
67 | 67 | c |
|
68 | 68 | b |
|
69 | 69 | EOF |
|
70 | 70 | echo d >> b |
|
71 | 71 | hg ci -mmerge2 -d '4 0' |
|
72 | 72 | echo % annotate after rename merge |
|
73 | 73 | hg annotate -nf b |
|
74 | ||
|
75 | echo % linkrev vs rev | |
|
76 | hg annotate -r tip a |
@@ -1,50 +1,54 | |||
|
1 | 1 | % init |
|
2 | 2 | % commit |
|
3 | 3 | adding a |
|
4 | 4 | % annotate -c |
|
5 | 5 | 8435f90966e4: a |
|
6 | 6 | % annotate -d |
|
7 | 7 | Thu Jan 01 00:00:01 1970 +0000: a |
|
8 | 8 | % annotate -n |
|
9 | 9 | 0: a |
|
10 | 10 | % annotate -u |
|
11 | 11 | nobody: a |
|
12 | 12 | % annotate -cdnu |
|
13 | 13 | nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a |
|
14 | 14 | % annotate b |
|
15 | 15 | 2: a |
|
16 | 16 | 2: a |
|
17 | 17 | 2: a |
|
18 | 18 | 3: b |
|
19 | 19 | 3: b |
|
20 | 20 | 3: b |
|
21 | 21 | % annotate -nf b |
|
22 | 22 | 0 a: a |
|
23 | 23 | 1 a: a |
|
24 | 24 | 1 a: a |
|
25 | 25 | 3 b: b |
|
26 | 26 | 3 b: b |
|
27 | 27 | 3 b: b |
|
28 | 28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 | 29 | merging b |
|
30 | 30 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
31 | 31 | (branch merge, don't forget to commit) |
|
32 | 32 | % annotate after merge |
|
33 | 33 | 0 a: a |
|
34 | 34 | 1 a: a |
|
35 | 35 | 1 a: a |
|
36 | 36 | 3 b: b |
|
37 | 37 | 4 b: c |
|
38 | 38 | 3 b: b |
|
39 | 39 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
40 | 40 | merging b |
|
41 | 41 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
42 | 42 | (branch merge, don't forget to commit) |
|
43 | 43 | % annotate after rename merge |
|
44 | 44 | 0 a: a |
|
45 | 45 | 6 b: z |
|
46 | 46 | 1 a: a |
|
47 | 47 | 3 b: b |
|
48 | 48 | 4 b: c |
|
49 | 49 | 3 b: b |
|
50 | 50 | 7 b: d |
|
51 | % linkrev vs rev | |
|
52 | 0: a | |
|
53 | 1: a | |
|
54 | 1: a |
General Comments 0
You need to be logged in to leave comments.
Login now