##// END OF EJS Templates
convert: handle empty intial commits while converting to svn...
Nikita Slyusarev -
r41765:2c13e91e default
parent child Browse files
Show More
@@ -1324,8 +1324,8 b' class svn_sink(converter_sink, commandli'
1324 try:
1324 try:
1325 rev = self.commit_re.search(output).group(1)
1325 rev = self.commit_re.search(output).group(1)
1326 except AttributeError:
1326 except AttributeError:
1327 if parents and not files:
1327 if not files:
1328 return parents[0]
1328 return parents[0] if parents else None
1329 self.ui.warn(_('unexpected svn output:\n'))
1329 self.ui.warn(_('unexpected svn output:\n'))
1330 self.ui.warn(output)
1330 self.ui.warn(output)
1331 raise error.Abort(_('unable to cope with svn output'))
1331 raise error.Abort(_('unable to cope with svn output'))
@@ -466,3 +466,46 b' Tags are not supported, but must not bre'
466 msg: Add file a
466 msg: Add file a
467 A /a
467 A /a
468 $ rm -rf a a-hg a-hg-wc
468 $ rm -rf a a-hg a-hg-wc
469
470 Skipping empty commits
471
472 $ hg init a
473
474 $ hg --cwd a --config ui.allowemptycommit=True ci -d '1 0' -m 'Initial empty commit'
475
476 $ echo a > a/a
477 $ hg --cwd a ci -d '0 0' -A -m 'Some change'
478 adding a
479 $ hg --cwd a --config ui.allowemptycommit=True ci -d '2 0' -m 'Empty commit 1'
480 $ hg --cwd a --config ui.allowemptycommit=True ci -d '3 0' -m 'Empty commit 2'
481 $ echo b > a/b
482 $ hg --cwd a ci -d '0 0' -A -m 'Another change'
483 adding b
484
485 $ hg convert -d svn a
486 assuming destination a-hg
487 initializing svn repository 'a-hg'
488 initializing svn working copy 'a-hg-wc'
489 scanning source...
490 sorting...
491 converting...
492 4 Initial empty commit
493 3 Some change
494 2 Empty commit 1
495 1 Empty commit 2
496 0 Another change
497
498 $ svnupanddisplay a-hg-wc 0
499 2 1 test a
500 2 2 test .
501 2 2 test b
502 revision: 2
503 author: test
504 msg: Another change
505 A /b
506 revision: 1
507 author: test
508 msg: Some change
509 A /a
510
511 $ rm -rf a a-hg a-hg-wc
General Comments 0
You need to be logged in to leave comments. Login now