2006-08-15 22:22:26 +04:00
|
|
|
% init
|
|
|
|
% commit
|
|
|
|
adding a
|
|
|
|
% annotate -c
|
|
|
|
8435f90966e4: a
|
2007-07-08 21:59:02 +04:00
|
|
|
% annotate -cl
|
|
|
|
8435f90966e4:1: a
|
2006-08-15 22:22:26 +04:00
|
|
|
% annotate -d
|
|
|
|
Thu Jan 01 00:00:01 1970 +0000: a
|
|
|
|
% annotate -n
|
|
|
|
0: a
|
2007-07-08 21:59:02 +04:00
|
|
|
% annotate -nl
|
|
|
|
0:1: a
|
2006-08-15 22:22:26 +04:00
|
|
|
% annotate -u
|
|
|
|
nobody: a
|
|
|
|
% annotate -cdnu
|
|
|
|
nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a
|
2007-07-08 21:59:02 +04:00
|
|
|
% annotate -cdnul
|
|
|
|
nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a
|
|
|
|
% annotate -n b
|
2006-09-27 20:10:21 +04:00
|
|
|
2: a
|
|
|
|
2: a
|
|
|
|
2: a
|
2007-07-08 21:59:02 +04:00
|
|
|
3: b4
|
|
|
|
3: b5
|
|
|
|
3: b6
|
|
|
|
% annotate -nl b
|
|
|
|
2:1: a
|
|
|
|
2:2: a
|
|
|
|
2:3: a
|
|
|
|
3:4: b4
|
|
|
|
3:5: b5
|
|
|
|
3:6: b6
|
2006-09-27 20:10:21 +04:00
|
|
|
% annotate -nf b
|
|
|
|
0 a: a
|
|
|
|
1 a: a
|
|
|
|
1 a: a
|
2007-07-08 21:59:02 +04:00
|
|
|
3 b: b4
|
|
|
|
3 b: b5
|
|
|
|
3 b: b6
|
|
|
|
% annotate -nlf b
|
|
|
|
0 a:1: a
|
|
|
|
1 a:2: a
|
|
|
|
1 a:3: a
|
|
|
|
3 b:4: b4
|
|
|
|
3 b:5: b5
|
|
|
|
3 b:6: b6
|
2006-09-27 20:10:21 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2008-03-21 13:06:02 +03:00
|
|
|
created new head
|
2006-09-27 20:10:21 +04:00
|
|
|
merging b
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
% annotate after merge
|
|
|
|
0 a: a
|
|
|
|
1 a: a
|
|
|
|
1 a: a
|
2007-07-08 21:59:02 +04:00
|
|
|
3 b: b4
|
2006-09-27 20:10:21 +04:00
|
|
|
4 b: c
|
2007-07-08 21:59:02 +04:00
|
|
|
3 b: b5
|
|
|
|
% annotate after merge with -l
|
|
|
|
0 a:1: a
|
|
|
|
1 a:2: a
|
|
|
|
1 a:3: a
|
|
|
|
3 b:4: b4
|
|
|
|
4 b:5: c
|
|
|
|
3 b:5: b5
|
2006-09-27 20:10:21 +04:00
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2008-03-21 13:06:02 +03:00
|
|
|
created new head
|
2006-09-27 20:10:21 +04:00
|
|
|
merging b
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
% annotate after rename merge
|
|
|
|
0 a: a
|
|
|
|
6 b: z
|
|
|
|
1 a: a
|
2007-07-08 21:59:02 +04:00
|
|
|
3 b: b4
|
2006-09-27 20:10:21 +04:00
|
|
|
4 b: c
|
2007-07-08 21:59:02 +04:00
|
|
|
3 b: b5
|
2006-09-27 20:10:21 +04:00
|
|
|
7 b: d
|
2007-07-08 21:59:02 +04:00
|
|
|
% annotate after rename merge with -l
|
|
|
|
0 a:1: a
|
|
|
|
6 b:2: z
|
|
|
|
1 a:3: a
|
|
|
|
3 b:4: b4
|
|
|
|
4 b:5: c
|
|
|
|
3 b:5: b5
|
|
|
|
7 b:7: d
|
2006-10-16 07:57:30 +04:00
|
|
|
% linkrev vs rev
|
|
|
|
0: a
|
|
|
|
1: a
|
|
|
|
1: a
|
2007-07-08 21:59:02 +04:00
|
|
|
% linkrev vs rev with -l
|
|
|
|
0:1: a
|
|
|
|
1:2: a
|
|
|
|
1:3: a
|
2007-06-20 02:10:21 +04:00
|
|
|
% generate ABA rename configuration
|
|
|
|
% annotate after ABA with follow
|
|
|
|
foo: foo
|