Mercurial > hg
diff tests/test-convert-cvs.out @ 5920:5df7cb799baf
CVS convert: Find correct parent for new branch (issue704)
Previously the parent was determined by the last changeset where the branched
file was changed even if the branch is based on an earlier revision.
Fix written by mpm.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 22 Jan 2008 00:16:50 +0100 |
parents | badf5711bd86 |
children | 549a7ebe1607 |
line wrap: on
line diff
--- a/tests/test-convert-cvs.out Tue Jan 22 00:08:43 2008 +0100 +++ b/tests/test-convert-cvs.out Tue Jan 22 00:16:50 2008 +0100 @@ -101,12 +101,12 @@ 0 Initial revision files: b/c o 5 (branch) ci2 files: b/c | -o 4 () ci1 files: a b/c -| -o 3 () update tags files: .hgtags -| -o 2 () ci0 files: b/c -| +| o 4 () ci1 files: a b/c +| | +| o 3 () update tags files: .hgtags +| | +| o 2 () ci0 files: b/c +|/ | o 1 (INITIAL) import files: |/ o 0 () Initial revision files: a b/c