Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-annotate.out @ 5374:e710874247d1
convert: allow the converter_source to say "skip this revision"
If getchanges returns a string, it's assumed to be the id of an
already converted revision. We map the current revision to the same
revision this converted revision was mapped to.
To allow skipping a root revision, getchanges can return the special
string 'hg-convert-skipped-revision' (a.k.a. common.SKIPREV), which
hopefully won't clash with any real id.
The converter_source is responsible for rewriting the parents of the
commit objects to make sure the revision graph makes sense.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 04 Oct 2007 23:21:37 -0300 |
parents | 2192001e4bb4 |
children |
line wrap: on
line source
% init % commit adding a % annotate -c 8435f90966e4: a % annotate -cl 8435f90966e4:1: a % annotate -d Thu Jan 01 00:00:01 1970 +0000: a % annotate -n 0: a % annotate -nl 0:1: a % annotate -u nobody: a % annotate -cdnu nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a % annotate -cdnul nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a % annotate -n b 2: a 2: a 2: a 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 % annotate -nf b 0 a: a 1 a: a 1 a: a 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 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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 3 b: b4 4 b: c 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 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 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 3 b: b4 4 b: c 3 b: b5 7 b: d % 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 % linkrev vs rev 0: a 1: a 1: a % linkrev vs rev with -l 0:1: a 1:2: a 1:3: a % generate ABA rename configuration % annotate after ABA with follow foo: foo