Mercurial > public > mercurial-scm > hg
diff tests/test-convert-svn-branches.out @ 6537:b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 14 Apr 2008 22:31:33 +0200 |
parents | 2bdd43246c95 |
children | 55bd855fc0af |
line wrap: on
line diff
--- a/tests/test-convert-svn-branches.out Mon Apr 14 22:31:33 2008 +0200 +++ b/tests/test-convert-svn-branches.out Mon Apr 14 22:31:33 2008 +0200 @@ -9,47 +9,47 @@ A A/branches A A/tags Checked out revision 1. -A trunk/letter.txt -A trunk/letter2.txt -A trunk/letter3.txt -A branches/readme.txt -Adding branches/readme.txt -Adding trunk/letter.txt -Adding trunk/letter2.txt -Adding trunk/letter3.txt +A trunk/a +A trunk/b +A trunk/c +A branches/notinbranch +Adding branches/notinbranch +Adding trunk/a +Adding trunk/b +Adding trunk/c Transmitting file data .... Committed revision 2. -% branch to old letters +% branch to old A branches/old -D branches/old/letter3.txt +D branches/old/c Adding branches/old -Adding branches/old/letter.txt -Adding branches/old/letter2.txt -Deleting branches/old/letter3.txt +Adding branches/old/a +Adding branches/old/b +Deleting branches/old/c Committed revision 3. At revision 3. % update trunk -Sending trunk/letter.txt +Sending trunk/a Transmitting file data . Committed revision 4. % update old branch -Sending branches/old/letter2.txt +Sending branches/old/b Transmitting file data . Committed revision 5. % create a cross-branch revision -A branches/old/letter3.txt -D trunk/letter2.txt -Adding branches/old/letter3.txt -Deleting trunk/letter2.txt +A branches/old/c +D trunk/b +Adding branches/old/c +Deleting trunk/b Transmitting file data . Committed revision 6. % update old branch again -Sending branches/old/letter2.txt +Sending branches/old/b Transmitting file data . Committed revision 7. % update trunk again -Sending trunk/letter.txt +Sending trunk/a Transmitting file data . Committed revision 8. % convert trunk and branches @@ -59,13 +59,13 @@ converting... 8 init projA 7 hello -6 branch trunk, remove letter3 -5 change letter -4 change letter2 -3 move and update letter3.txt -2 move and update letter3.txt -1 change letter2 again -0 last change to letter +6 branch trunk, remove c +5 change a +4 change b +3 move and update c +2 move and update c +1 change b again +0 last change to a % branch again from a converted revision Checked out revision 1. A branches/old2 @@ -79,21 +79,21 @@ 0 branch trunk@1 into old2 o 9 branch trunk@1 into old2 files: | -| o 8 last change to letter files: letter.txt +| o 8 last change to a files: a | | -| | o 7 change letter2 again files: letter2.txt +| | o 7 change b again files: b | | | -| o | 6 move and update letter3.txt files: letter2.txt +| o | 6 move and update c files: b | | | -| | o 5 move and update letter3.txt files: letter3.txt +| | o 5 move and update c files: c | | | -| | o 4 change letter2 files: letter2.txt +| | o 4 change b files: b | | | -| o | 3 change letter files: letter.txt +| o | 3 change a files: a | | | -+---o 2 branch trunk, remove letter3 files: letter.txt letter2.txt ++---o 2 branch trunk, remove c files: a b | | -| o 1 hello files: letter.txt letter2.txt letter3.txt +| o 1 hello files: a b c |/ o 0 init projA files: