Mercurial > hg
comparison tests/test-convert-svn-branches @ 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 |
comparison
equal
deleted
inserted
replaced
| 6536:dfdef3d560a8 | 6537:b6a24c273c30 |
|---|---|
| 33 svn import -m "init projA" projA $svnurl | fix_path | 33 svn import -m "init projA" projA $svnurl | fix_path |
| 34 | 34 |
| 35 echo % update svn repository | 35 echo % update svn repository |
| 36 svn co $svnurl A | fix_path | 36 svn co $svnurl A | fix_path |
| 37 cd A | 37 cd A |
| 38 echo hello > trunk/letter.txt | 38 echo a > trunk/a |
| 39 echo hey > trunk/letter2.txt | 39 echo b > trunk/b |
| 40 echo ho > trunk/letter3.txt | 40 echo c > trunk/c |
| 41 # Add a file within branches, used to confuse branch detection | 41 # Add a file within branches, used to confuse branch detection |
| 42 echo a > branches/readme.txt | 42 echo d > branches/notinbranch |
| 43 svn add trunk/letter.txt trunk/letter2.txt trunk/letter3.txt branches/readme.txt | 43 svn add trunk/a trunk/b trunk/c branches/notinbranch |
| 44 svn ci -m hello | 44 svn ci -m hello |
| 45 | 45 |
| 46 echo % branch to old letters | 46 echo % branch to old |
| 47 svn copy trunk branches/old | 47 svn copy trunk branches/old |
| 48 svn rm branches/old/letter3.txt | 48 svn rm branches/old/c |
| 49 svn ci -m "branch trunk, remove letter3" | 49 svn ci -m "branch trunk, remove c" |
| 50 svn up | 50 svn up |
| 51 | 51 |
| 52 echo % update trunk | 52 echo % update trunk |
| 53 "$TESTDIR/svn-safe-append.py" "what can I say ?" trunk/letter.txt | 53 "$TESTDIR/svn-safe-append.py" a trunk/a |
| 54 svn ci -m "change letter" | 54 svn ci -m "change a" |
| 55 | 55 |
| 56 echo % update old branch | 56 echo % update old branch |
| 57 "$TESTDIR/svn-safe-append.py" "what's up ?" branches/old/letter2.txt | 57 "$TESTDIR/svn-safe-append.py" b branches/old/b |
| 58 svn ci -m "change letter2" | 58 svn ci -m "change b" |
| 59 | 59 |
| 60 echo % create a cross-branch revision | 60 echo % create a cross-branch revision |
| 61 svn move -m "move letter2" trunk/letter2.txt \ | 61 svn move -m "move b" trunk/b branches/old/c |
| 62 branches/old/letter3.txt | 62 "$TESTDIR/svn-safe-append.py" c branches/old/c |
| 63 "$TESTDIR/svn-safe-append.py" "I am fine" branches/old/letter3.txt | 63 svn ci -m "move and update c" |
| 64 svn ci -m "move and update letter3.txt" | |
| 65 | 64 |
| 66 echo % update old branch again | 65 echo % update old branch again |
| 67 "$TESTDIR/svn-safe-append.py" "bye" branches/old/letter2.txt | 66 "$TESTDIR/svn-safe-append.py" b branches/old/b |
| 68 svn ci -m "change letter2 again" | 67 svn ci -m "change b again" |
| 69 | 68 |
| 70 echo % update trunk again | 69 echo % update trunk again |
| 71 "$TESTDIR/svn-safe-append.py" "how are you ?" trunk/letter.txt | 70 "$TESTDIR/svn-safe-append.py" a trunk/a |
| 72 svn ci -m "last change to letter" | 71 svn ci -m "last change to a" |
| 73 cd .. | 72 cd .. |
| 74 | 73 |
| 75 echo % convert trunk and branches | 74 echo % convert trunk and branches |
| 76 hg convert --datesort $svnurl A-hg | 75 hg convert --datesort $svnurl A-hg |
| 77 | 76 |