Skip to content
Snippets Groups Projects
Commit 675e4155 authored by Matt Mackall's avatar Matt Mackall
Browse files

test-convert-svn-sink: properly isolate symlink section

This was fixed earlier by moving all the symlink bits to a section to
the end of the file, but then it was broken (by the same person) by
adding more tests at the end.
parent 30124c40
No related branches found
No related tags found
No related merge requests found
......@@ -224,9 +224,9 @@
adding link
$ hg --cwd a mv link newlink
$ hg --cwd a commit -m 'move symlink'
$ hg convert -d svn a
assuming destination a-hg
initializing svn working copy 'a-hg-wc'
$ hg convert -d svn a a-svnlink
initializing svn repository 'a-svnlink'
initializing svn working copy 'a-svnlink-wc'
scanning source...
sorting...
converting...
......@@ -230,5 +230,11 @@
scanning source...
sorting...
converting...
7 add a file
6 modify a file
5 rename a file
4 copy a file
3 remove a file
2 make a file executable
1 add symlink
0 move symlink
......@@ -233,6 +239,6 @@
1 add symlink
0 move symlink
$ svnupanddisplay a-hg-wc 1
$ svnupanddisplay a-svnlink-wc 1
8 1 test d1
8 1 test d1/d2
8 1 test d1/d2/b
......@@ -245,6 +251,13 @@
D /link
A /newlink (from /link@7)
Make sure our changes don't affect the rest of the test cases
$ hg --cwd a up 5
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg --cwd a --config extensions.strip= strip -r 6
saved backup bundle to $TESTTMP/a/.hg/strip-backup/bd4f7b7a7067-backup.hg
#endif
Convert with --full adds and removes files that didn't change
......@@ -260,13 +273,13 @@
converting...
0 f
$ svnupanddisplay a-hg-wc 1
9 9 test .
9 9 test d
9 9 test f
revision: 9
7 7 test .
7 7 test d
7 7 test f
revision: 7
author: test
msg: f
D /c
A /d
D /d1
A /f
......@@ -267,10 +280,9 @@
author: test
msg: f
D /c
A /d
D /d1
A /f
D /newlink
$ rm -rf a a-hg a-hg-wc
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment