equal
deleted
inserted
replaced
463 $ cat >> .gitmodules <<EOF |
463 $ cat >> .gitmodules <<EOF |
464 > [submodule "git-repo5"] |
464 > [submodule "git-repo5"] |
465 > path = git-repo5 |
465 > path = git-repo5 |
466 > url = $TESTTMP/git-repo5 |
466 > url = $TESTTMP/git-repo5 |
467 > EOF |
467 > EOF |
468 $ git commit -a -m "weird white space submodule" |
468 $ git commit -q -a -m "weird white space submodule" |
469 [master *] weird white space submodule (glob) |
|
470 Author: nottest <test@example.org> |
|
471 1 file changed, 3 insertions(+) |
|
472 $ cd .. |
469 $ cd .. |
473 $ hg convert git-repo6 hg-repo6 |
470 $ hg convert git-repo6 hg-repo6 |
474 initializing destination hg-repo6 repository |
471 initializing destination hg-repo6 repository |
475 scanning source... |
472 scanning source... |
476 sorting... |
473 sorting... |
487 |
484 |
488 $ git submodule add ../git-repo4 >/dev/null 2>/dev/null |
485 $ git submodule add ../git-repo4 >/dev/null 2>/dev/null |
489 $ git checkout HEAD .gitmodules |
486 $ git checkout HEAD .gitmodules |
490 $ git rm .gitmodules |
487 $ git rm .gitmodules |
491 rm '.gitmodules' |
488 rm '.gitmodules' |
492 $ git commit -m "remove .gitmodules" .gitmodules |
489 $ git commit -q -m "remove .gitmodules" .gitmodules |
493 [master *] remove .gitmodules (glob) |
490 $ git commit -q -m "missing .gitmodules" |
494 Author: nottest <test@example.org> |
|
495 1 file changed, 3 deletions(-) |
|
496 delete mode 100644 .gitmodules |
|
497 $ git commit -m "missing .gitmodules" |
|
498 [master *] missing .gitmodules (glob) |
|
499 Author: nottest <test@example.org> |
|
500 1 file changed, 1 insertion(+) |
|
501 create mode 160000 git-repo4 |
|
502 $ cd .. |
491 $ cd .. |
503 $ hg convert git-repo6 hg-repo6 --traceback |
492 $ hg convert git-repo6 hg-repo6 --traceback |
504 fatal: Path '.gitmodules' does not exist in '*' (glob) |
493 fatal: Path '.gitmodules' does not exist in '*' (glob) |
505 initializing destination hg-repo6 repository |
494 initializing destination hg-repo6 repository |
506 scanning source... |
495 scanning source... |