Show More
@@ -1138,6 +1138,8 b' class svn_sink(converter_sink, commandli' | |||||
1138 | try: |
|
1138 | try: | |
1139 | rev = self.commit_re.search(output).group(1) |
|
1139 | rev = self.commit_re.search(output).group(1) | |
1140 | except AttributeError: |
|
1140 | except AttributeError: | |
|
1141 | if not files: | |||
|
1142 | return parents[0] | |||
1141 | self.ui.warn(_('unexpected svn output:\n')) |
|
1143 | self.ui.warn(_('unexpected svn output:\n')) | |
1142 | self.ui.warn(output) |
|
1144 | self.ui.warn(output) | |
1143 | raise util.Abort(_('unable to cope with svn output')) |
|
1145 | raise util.Abort(_('unable to cope with svn output')) |
@@ -9,6 +9,7 b' fix_path()' | |||||
9 |
|
9 | |||
10 | echo "[extensions]" >> $HGRCPATH |
|
10 | echo "[extensions]" >> $HGRCPATH | |
11 | echo "convert = " >> $HGRCPATH |
|
11 | echo "convert = " >> $HGRCPATH | |
|
12 | echo "mq = " >> $HGRCPATH | |||
12 |
|
13 | |||
13 | svnpath=`pwd | fix_path`/svn-repo |
|
14 | svnpath=`pwd | fix_path`/svn-repo | |
14 | svnadmin create $svnpath |
|
15 | svnadmin create $svnpath | |
@@ -59,9 +60,14 b' hg convert -s hg -d svn $svnpath-hg $svn' | |||||
59 | echo % new hg rev |
|
60 | echo % new hg rev | |
60 |
|
61 | |||
61 | hg clone $svnpath-hg $svnpath-work |
|
62 | hg clone $svnpath-hg $svnpath-work | |
62 |
|
|
63 | cd $svnpath-work | |
63 | hg --cwd $svnpath-work add b |
|
64 | echo b > b | |
64 | hg --cwd $svnpath-work ci -mb |
|
65 | hg add b | |
|
66 | hg ci -mb | |||
|
67 | echo '% adding an empty revision' | |||
|
68 | hg qnew -m emtpy empty | |||
|
69 | hg qfinish -a | |||
|
70 | cd .. | |||
65 |
|
71 | |||
66 | echo % echo hg to svn |
|
72 | echo % echo hg to svn | |
67 | hg --cwd $svnpath-hg pull -q $svnpath-work |
|
73 | hg --cwd $svnpath-hg pull -q $svnpath-work |
@@ -21,11 +21,13 b' converting...' | |||||
21 | % new hg rev |
|
21 | % new hg rev | |
22 | updating to branch default |
|
22 | updating to branch default | |
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
24 | % adding an empty revision | |||
24 | % echo hg to svn |
|
25 | % echo hg to svn | |
25 | scanning source... |
|
26 | scanning source... | |
26 | sorting... |
|
27 | sorting... | |
27 | converting... |
|
28 | converting... | |
28 |
|
|
29 | 1 b | |
|
30 | 0 emtpy | |||
29 | % svn back to hg should do nothing |
|
31 | % svn back to hg should do nothing | |
30 | scanning source... |
|
32 | scanning source... | |
31 | sorting... |
|
33 | sorting... |
General Comments 0
You need to be logged in to leave comments.
Login now