test-convert-svn-branches: short identifiers are more legible
authorPatrick Mezard <pmezard@gmail.com>
Mon, 14 Apr 2008 22:31:33 +0200
changeset 6537 b6a24c273c30
parent 6536 dfdef3d560a8
child 6538 05dff77bfbd9
test-convert-svn-branches: short identifiers are more legible
tests/test-convert-svn-branches
tests/test-convert-svn-branches.out
--- a/tests/test-convert-svn-branches	Mon Apr 14 22:31:33 2008 +0200
+++ b/tests/test-convert-svn-branches	Mon Apr 14 22:31:33 2008 +0200
@@ -35,41 +35,40 @@
 echo % update svn repository
 svn co $svnurl A | fix_path
 cd A
-echo hello > trunk/letter.txt
-echo hey > trunk/letter2.txt
-echo ho > trunk/letter3.txt
+echo a > trunk/a
+echo b > trunk/b
+echo c > trunk/c
 # Add a file within branches, used to confuse branch detection
-echo a > branches/readme.txt
-svn add trunk/letter.txt trunk/letter2.txt trunk/letter3.txt branches/readme.txt
+echo d > branches/notinbranch
+svn add trunk/a trunk/b trunk/c branches/notinbranch
 svn ci -m hello
 
-echo % branch to old letters
+echo % branch to old
 svn copy trunk branches/old
-svn rm branches/old/letter3.txt
-svn ci -m "branch trunk, remove letter3"
+svn rm branches/old/c
+svn ci -m "branch trunk, remove c"
 svn up
 
 echo % update trunk
-"$TESTDIR/svn-safe-append.py" "what can I say ?" trunk/letter.txt
-svn ci -m "change letter"
+"$TESTDIR/svn-safe-append.py" a trunk/a
+svn ci -m "change a"
 
 echo % update old branch
-"$TESTDIR/svn-safe-append.py" "what's up ?" branches/old/letter2.txt
-svn ci -m "change letter2"
+"$TESTDIR/svn-safe-append.py" b branches/old/b
+svn ci -m "change b"
 
 echo % create a cross-branch revision
-svn move -m "move letter2" trunk/letter2.txt \
-    branches/old/letter3.txt
-"$TESTDIR/svn-safe-append.py" "I am fine" branches/old/letter3.txt
-svn ci -m "move and update letter3.txt"
+svn move -m "move b" trunk/b branches/old/c
+"$TESTDIR/svn-safe-append.py" c branches/old/c
+svn ci -m "move and update c"
 
 echo % update old branch again
-"$TESTDIR/svn-safe-append.py" "bye" branches/old/letter2.txt
-svn ci -m "change letter2 again"
+"$TESTDIR/svn-safe-append.py" b branches/old/b
+svn ci -m "change b again"
 
 echo % update trunk again
-"$TESTDIR/svn-safe-append.py" "how are you ?" trunk/letter.txt
-svn ci -m "last change to letter"
+"$TESTDIR/svn-safe-append.py" a trunk/a
+svn ci -m "last change to a"
 cd ..
 
 echo % convert trunk and branches
--- 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: