diff --git a/hggit/git_handler.py b/hggit/git_handler.py index 88657cbf4eba4c447da484bed9164207a532e883_aGdnaXQvZ2l0X2hhbmRsZXIucHk=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_aGdnaXQvZ2l0X2hhbmRsZXIucHk= 100644 --- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -886,7 +886,7 @@ # import each of the commits, oldest first total = len(commits) if total: - self.ui.status(_(b"importing git objects into hg\n")) + self.ui.status(_(b"importing %d git commits\n") % total) else: self.ui.status(_(b"no changes found\n")) diff --git a/tests/test-ambiguousprefix.t b/tests/test-ambiguousprefix.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1hbWJpZ3VvdXNwcmVmaXgudA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1hbWJpZ3VvdXNwcmVmaXgudA== 100644 --- a/tests/test-ambiguousprefix.t +++ b/tests/test-ambiguousprefix.t @@ -21,7 +21,7 @@ $ cd .. $ hg clone gitrepo hgrepo - importing git objects into hg + importing 3 git commits new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-branch-bookmark-suffix.t b/tests/test-branch-bookmark-suffix.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1icmFuY2gtYm9va21hcmstc3VmZml4LnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1icmFuY2gtYm9va21hcmstc3VmZml4LnQ= 100644 --- a/tests/test-branch-bookmark-suffix.t +++ b/tests/test-branch-bookmark-suffix.t @@ -99,7 +99,7 @@ default = $TESTTMP/gitrepo1 (with-path !) $ hg pull ../gitrepo1 pulling from ../gitrepo1 - importing git objects into hg + importing 3 git commits new changesets 8211cade99e4:faf44fc3a4e8 (3 drafts) (run 'hg heads' to see heads) $ hg log --graph @@ -145,7 +145,7 @@ $ rm -r hgrepo $ hg clone -r branch3 gitrepo1 hgrepo - importing git objects into hg + importing 4 git commits new changesets 40a840c1f8ae:faf44fc3a4e8 (4 drafts) updating to bookmark branch3_bookmark (hg57 !) updating to branch default (no-hg57 !) @@ -191,7 +191,7 @@ $ rm -r hgrepo $ hg clone -r branch1 gitrepo1 hgrepo - importing git objects into hg + importing 2 git commits new changesets 40a840c1f8ae:8211cade99e4 (2 drafts) updating to branch branch1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -214,4 +214,3 @@ summary: add f1 $ cd .. - diff --git a/tests/test-clone.t b/tests/test-clone.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1jbG9uZS50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1jbG9uZS50 100644 --- a/tests/test-clone.t +++ b/tests/test-clone.t @@ -26,7 +26,7 @@ $ cd .. clone a tag $ hg clone -r alpha gitrepo hgrepo-a - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -48,7 +48,7 @@ clone a branch $ hg clone -r beta gitrepo hgrepo-b - importing git objects into hg + importing 2 git commits new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -84,7 +84,7 @@ $ cd .. $ hg clone -r beta gitrepo hgrepo-c - importing git objects into hg + importing 4 git commits new changesets ff7a2f2d8d70:47d12948785d (4 drafts) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -96,7 +96,7 @@ test shared repositories $ hg clone gitrepo hgrepo-base - importing git objects into hg + importing 5 git commits new changesets ff7a2f2d8d70:47d12948785d (5 drafts) updating to branch default (no-hg57 !) updating to bookmark beta (hg57 !) @@ -128,7 +128,7 @@ $ git checkout -q master $ cd .. $ hg clone gitrepo hgrepo-2 - importing git objects into hg + importing 5 git commits new changesets ff7a2f2d8d70:47d12948785d (5 drafts) updating to bookmark master (hg57 !) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (hg57 !) @@ -152,9 +152,9 @@ $ cd .. #if hg57 $ hg clone gitrepo hgrepo-2 - importing git objects into hg + importing 5 git commits new changesets ff7a2f2d8d70:47d12948785d (5 drafts) updating to bookmark master 1 files updated, 0 files merged, 0 files removed, 0 files unresolved #else $ hg clone gitrepo hgrepo-2 @@ -156,9 +156,9 @@ new changesets ff7a2f2d8d70:47d12948785d (5 drafts) updating to bookmark master 1 files updated, 0 files merged, 0 files removed, 0 files unresolved #else $ hg clone gitrepo hgrepo-2 - importing git objects into hg + importing 5 git commits new changesets ff7a2f2d8d70:47d12948785d (5 drafts) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -180,7 +180,7 @@ $ fn_git_commit -m 'add delta' $ cd .. $ hg clone gitrepo hgrepo-2 - importing git objects into hg + importing 5 git commits new changesets ff7a2f2d8d70:47d12948785d (5 drafts) warning: the git source repository has a detached head (you may want to update to a bookmark) diff --git a/tests/test-conflict-1.t b/tests/test-conflict-1.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1jb25mbGljdC0xLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1jb25mbGljdC0xLnQ= 100644 --- a/tests/test-conflict-1.t +++ b/tests/test-conflict-1.t @@ -55,7 +55,7 @@ $ cd .. $ hg clone gitrepo hgrepo2 - importing git objects into hg + importing 4 git commits new changesets 5d1a6b64f9d0:6c53bc0f062f (4 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-conflict-2.t b/tests/test-conflict-2.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1jb25mbGljdC0yLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1jb25mbGljdC0yLnQ= 100644 --- a/tests/test-conflict-2.t +++ b/tests/test-conflict-2.t @@ -55,7 +55,7 @@ $ cd .. $ hg clone gitrepo hgrepo2 - importing git objects into hg + importing 4 git commits new changesets 5d1a6b64f9d0:120385945d08 (4 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-convergedmerge.t b/tests/test-convergedmerge.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1jb252ZXJnZWRtZXJnZS50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1jb252ZXJnZWRtZXJnZS50 100644 --- a/tests/test-convergedmerge.t +++ b/tests/test-convergedmerge.t @@ -57,7 +57,7 @@ $ cd .. $ hg clone gitrepo hgrepo2 - importing git objects into hg + importing 5 git commits new changesets 5d1a6b64f9d0:eaa21d002113 (5 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-empty-working-tree.t b/tests/test-empty-working-tree.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1lbXB0eS13b3JraW5nLXRyZWUudA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1lbXB0eS13b3JraW5nLXRyZWUudA== 100644 --- a/tests/test-empty-working-tree.t +++ b/tests/test-empty-working-tree.t @@ -11,7 +11,7 @@ Initialized empty Git repository in $TESTTMP/gitrepo2/ $ hg clone gitrepo hgrepo - importing git objects into hg + importing 1 git commits new changesets 01708ca54a8f (1 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-encoding.t b/tests/test-encoding.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1lbmNvZGluZy50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1lbmNvZGluZy50 100644 --- a/tests/test-encoding.t +++ b/tests/test-encoding.t @@ -43,7 +43,7 @@ Initialized empty Git repository in $TESTTMP/gitrepo2/ $ hg clone gitrepo hgrepo - importing git objects into hg + importing 4 git commits new changesets 87cd29b67a91:b8a0ac52f339 (4 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-extra.t b/tests/test-extra.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1leHRyYS50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1leHRyYS50 100644 --- a/tests/test-extra.t +++ b/tests/test-extra.t @@ -12,7 +12,7 @@ $ cd .. $ hg clone gitrepo hgrepo - importing git objects into hg + importing 1 git commits new changesets aa9eb6424386 (1 drafts) updating to branch default (no-hg57 !) updating to bookmark not-master (hg57 !) diff --git a/tests/test-file-removal.t b/tests/test-file-removal.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1maWxlLXJlbW92YWwudA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1maWxlLXJlbW92YWwudA== 100644 --- a/tests/test-file-removal.t +++ b/tests/test-file-removal.t @@ -99,7 +99,7 @@ Initialized empty Git repository in $TESTTMP/gitrepo2/ $ hg clone gitrepo hgrepo - importing git objects into hg + importing 9 git commits new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) @@ -233,7 +233,7 @@ test with rename detection enabled $ hg --config git.similarity=100 clone gitrepo hgreporenames - importing git objects into hg + importing 9 git commits new changesets ff7a2f2d8d70:0995b8a0a943 (9 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-git-clone.t b/tests/test-git-clone.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1naXQtY2xvbmUudA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1naXQtY2xvbmUudA== 100644 --- a/tests/test-git-clone.t +++ b/tests/test-git-clone.t @@ -14,7 +14,7 @@ $ cd .. $ hg clone gitrepo hgrepo - importing git objects into hg + importing 2 git commits new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-git-gpg.t b/tests/test-git-gpg.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1naXQtZ3BnLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1naXQtZ3BnLnQ= 100644 --- a/tests/test-git-gpg.t +++ b/tests/test-git-gpg.t @@ -55,7 +55,7 @@ Hg clone it $ hg clone gitrepo hgrepo - importing git objects into hg + importing 2 git commits new changesets ab60c5e55bd6:[0-9a-f]{12,12} \(2 drafts\) (re) updating to branch default (no-hg57 !) updating to bookmark signed (hg57 !) diff --git a/tests/test-git-submodules.t b/tests/test-git-submodules.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1naXQtc3VibW9kdWxlcy50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1naXQtc3VibW9kdWxlcy50 100644 --- a/tests/test-git-submodules.t +++ b/tests/test-git-submodules.t @@ -188,7 +188,7 @@ $ cd .. $ hg clone gitrepo2 hgrepo - importing git objects into hg + importing 10 git commits new changesets ff7a2f2d8d70:9c3929c04f22 (10 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) @@ -356,7 +356,7 @@ are the same is enough $ cd ../../.. $ hg --config git.similarity=100 clone gitrepo2 hgreporenames - importing git objects into hg + importing 10 git commits new changesets ff7a2f2d8d70:9c3929c04f22 (10 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-git-tags.t b/tests/test-git-tags.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1naXQtdGFncy50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1naXQtdGFncy50 100644 --- a/tests/test-git-tags.t +++ b/tests/test-git-tags.t @@ -16,7 +16,7 @@ $ cd .. $ hg clone gitrepo hgrepo - importing git objects into hg + importing 2 git commits new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) @@ -254,7 +254,7 @@ $ cd hgrepo $ rm .hg/git-tags .hg/git-mapfile $ hg gimport - importing git objects into hg + importing 6 git commits $ hg tags -q tip default/master diff --git a/tests/test-git-workflow.t b/tests/test-git-workflow.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1naXQtd29ya2Zsb3cudA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1naXQtd29ya2Zsb3cudA== 100644 --- a/tests/test-git-workflow.t +++ b/tests/test-git-workflow.t @@ -50,7 +50,7 @@ get things back to hg $ hg gimport - importing git objects into hg + importing 1 git commits new changesets 9f124f3c1fc2 (1 drafts) $ hg log --graph --debug | grep -v phase: o changeset: 1:9f124f3c1fc29a14f5eb027c24811b0ac9d5ff10 @@ -116,7 +116,7 @@ > GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \ > git commit -m newcommit > /dev/null || echo "git commit error" $ hg gimport - importing git objects into hg + importing 2 git commits new changesets befdecd14df5:3d10b7289d79 (2 drafts) $ hg log --graph o changeset: 3:3d10b7289d79 diff --git a/tests/test-hg-author.t b/tests/test-hg-author.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1oZy1hdXRob3IudA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1oZy1hdXRob3IudA== 100644 --- a/tests/test-hg-author.t +++ b/tests/test-hg-author.t @@ -19,7 +19,7 @@ $ cd .. $ hg clone repo.git hgrepo - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) @@ -158,7 +158,7 @@ $ cd .. $ hg clone repo.git hgrepo2 - importing git objects into hg + importing 9 git commits new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-hg-branch.t b/tests/test-hg-branch.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1oZy1icmFuY2gudA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1oZy1icmFuY2gudA== 100644 --- a/tests/test-hg-branch.t +++ b/tests/test-hg-branch.t @@ -12,7 +12,7 @@ $ cd .. $ hg clone gitrepo hgrepo - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) updating to bookmark not-master (hg57 !) updating to branch default (no-hg57 !) @@ -66,7 +66,7 @@ $ cd .. $ hg clone -U gitrepo hgrepo2 - importing git objects into hg + importing 3 git commits new changesets ff7a2f2d8d70:400db38f4f64 (3 drafts) $ hg -R hgrepo2 log --graph o changeset: 2:400db38f4f64 diff --git a/tests/test-hg-tags.t b/tests/test-hg-tags.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1oZy10YWdzLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1oZy10YWdzLnQ= 100644 --- a/tests/test-hg-tags.t +++ b/tests/test-hg-tags.t @@ -19,7 +19,7 @@ $ cd .. $ hg clone -U repo.git hgrepo - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) $ cd hgrepo @@ -61,7 +61,7 @@ $ cd .. $ hg clone repo.git hgrepo2 - importing git objects into hg + importing 2 git commits new changesets ff7a2f2d8d70:e8b150f84560 (2 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) diff --git a/tests/test-illegal-contents.t b/tests/test-illegal-contents.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1pbGxlZ2FsLWNvbnRlbnRzLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1pbGxlZ2FsLWNvbnRlbnRzLnQ= 100644 --- a/tests/test-illegal-contents.t +++ b/tests/test-illegal-contents.t @@ -133,9 +133,9 @@ $ fn_git_commit -m 'add a Mercurial repository' $ cd .. $ hg clone --config hggit.invalidpaths=abort git hg - importing git objects into hg + importing 1 git commits abort: invalid path 'nested/.hg/00changelog.i' rejected by configuration (see 'hg help hggit' for details) [255] $ rm -rf hg $ hg clone --config hggit.invalidpaths=keep git hg @@ -137,9 +137,9 @@ abort: invalid path 'nested/.hg/00changelog.i' rejected by configuration (see 'hg help hggit' for details) [255] $ rm -rf hg $ hg clone --config hggit.invalidpaths=keep git hg - importing git objects into hg + importing 1 git commits warning: path 'nested/.hg/00changelog.i' contains an invalid path component warning: path 'nested/.hg/requires' contains an invalid path component new changesets [0-9a-f]{12,12} \(1 drafts\) (re) @@ -149,7 +149,7 @@ [255] $ rm -rf hg $ hg clone git hg - importing git objects into hg + importing 1 git commits warning: skipping invalid path 'nested/.hg/00changelog.i' warning: skipping invalid path 'nested/.hg/requires' new changesets 3ea18a67c0e6 (1 drafts) @@ -170,8 +170,8 @@ $ fn_git_commit -m 'add files disallowed by mercurial' $ cd .. $ hg clone --config hggit.invalidpaths=abort git hg - importing git objects into hg + importing 1 git commits abort: invalid path 'Icon\r' rejected by configuration (see 'hg help hggit' for details) [255] $ hg clone --config hggit.invalidpaths=keep git hg @@ -174,8 +174,8 @@ abort: invalid path 'Icon\r' rejected by configuration (see 'hg help hggit' for details) [255] $ hg clone --config hggit.invalidpaths=keep git hg - importing git objects into hg + importing 1 git commits warning: skipping invalid path 'Icon\r' warning: skipping invalid path 'the\nfile' new changesets 8354c06a5842 (1 drafts) @@ -184,7 +184,7 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ rm -rf hg $ hg clone git hg - importing git objects into hg + importing 1 git commits warning: skipping invalid path 'Icon\r' warning: skipping invalid path 'the\nfile' new changesets 8354c06a5842 (1 drafts) diff --git a/tests/test-incoming.t b/tests/test-incoming.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1pbmNvbWluZy50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1pbmNvbWluZy50 100644 --- a/tests/test-incoming.t +++ b/tests/test-incoming.t @@ -20,7 +20,7 @@ $ hg clone gitrepo hgrepo - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) @@ -139,7 +139,7 @@ "adding remote bookmark" message was added in Mercurial 2.3 $ hg pull | grep -v "adding remote bookmark" pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 3 git commits new changesets 7fe02317c63d:248d83ebf472 (3 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg incoming | grep -v 'no changes found' diff --git a/tests/test-invalid-refs.t b/tests/test-invalid-refs.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1pbnZhbGlkLXJlZnMudA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1pbnZhbGlkLXJlZnMudA== 100644 --- a/tests/test-invalid-refs.t +++ b/tests/test-invalid-refs.t @@ -12,7 +12,7 @@ $ cd .. $ hg clone -U gitrepo hgrepo - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) $ cd hgrepo @@ -83,7 +83,7 @@ $ cd .. $ hg clone -U gitrepo hgrepo2 - importing git objects into hg + importing 4 git commits new changesets ff7a2f2d8d70:0950ab44ea23 (4 drafts) $ hg -R hgrepo2 log --graph o changeset: 3:0950ab44ea23 diff --git a/tests/test-keywords.t b/tests/test-keywords.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1rZXl3b3Jkcy50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1rZXl3b3Jkcy50 100644 --- a/tests/test-keywords.t +++ b/tests/test-keywords.t @@ -21,7 +21,7 @@ $ cd .. $ hg clone gitrepo hgrepo - importing git objects into hg + importing 3 git commits new changesets ff7a2f2d8d70:8e3f0ecc9aef (3 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-merge.t b/tests/test-merge.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1tZXJnZS50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1tZXJnZS50 100644 --- a/tests/test-merge.t +++ b/tests/test-merge.t @@ -32,7 +32,7 @@ Initialized empty Git repository in $TESTTMP/gitrepo2/ $ hg clone gitrepo hgrepo - importing git objects into hg + importing 4 git commits new changesets ff7a2f2d8d70:89ca4a68d6b9 (4 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-multiple-remotes.t b/tests/test-multiple-remotes.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1tdWx0aXBsZS1yZW1vdGVzLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1tdWx0aXBsZS1yZW1vdGVzLnQ= 100644 --- a/tests/test-multiple-remotes.t +++ b/tests/test-multiple-remotes.t @@ -29,7 +29,7 @@ $ hg pull pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) (run 'hg update' to get a working copy) pulling from $TESTTMP/repo.git diff --git a/tests/test-octopus.t b/tests/test-octopus.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1vY3RvcHVzLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1vY3RvcHVzLnQ= 100644 --- a/tests/test-octopus.t +++ b/tests/test-octopus.t @@ -63,7 +63,7 @@ Initialized empty Git repository in $TESTTMP/gitrepo2/ $ hg clone gitrepo hgrepo - importing git objects into hg + importing 8 git commits new changesets ff7a2f2d8d70:307506d6ae8a (10 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-orphan-tags.t b/tests/test-orphan-tags.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1vcnBoYW4tdGFncy50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1vcnBoYW4tdGFncy50 100644 --- a/tests/test-orphan-tags.t +++ b/tests/test-orphan-tags.t @@ -64,7 +64,7 @@ Create a Mercurial clone $ hg clone -U git.bare hg - importing git objects into hg + importing 4 git commits new changesets b8e77484829b:387d03400596 (4 drafts) $ hg outgoing -R hg comparing with $TESTTMP/git.bare @@ -95,7 +95,10 @@ date: Mon Jan 01 00:00:12 2007 +0000 summary: add foo3 - $ hg push --debug | grep -e reference -e commits - finding hg commits to export + $ hg push --debug + pushing to $TESTTMP/git.bare + finding unexported changesets + saving git map to $TESTTMP/hg/.hg/git-mapfile + searching for changes 1 commits found list of commits: @@ -100,5 +103,7 @@ 1 commits found list of commits: + e12852326ef72772e9696b008ad6546b5266ff13 + adding objects added 1 commits with 1 trees and 0 blobs unchanged reference default::refs/heads/master => GIT:996e5084 adding reference default::refs/tags/the_tag => GIT:e4338156 diff --git a/tests/test-outgoing.t b/tests/test-outgoing.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1vdXRnb2luZy50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1vdXRnb2luZy50 100644 --- a/tests/test-outgoing.t +++ b/tests/test-outgoing.t @@ -14,7 +14,7 @@ $ cd .. $ hg clone gitrepo hgrepo - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) @@ -104,7 +104,7 @@ let's pull and try again $ hg pull pulling from */gitrepo (glob) - importing git objects into hg + importing 1 git commits new changesets 25eed24f5e8f (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg log --graph diff --git a/tests/test-phases-draft.t b/tests/test-phases-draft.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1waGFzZXMtZHJhZnQudA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1waGFzZXMtZHJhZnQudA== 100644 --- a/tests/test-phases-draft.t +++ b/tests/test-phases-draft.t @@ -12,7 +12,7 @@ cloning without hggit.usephases does not publish local changesets $ cd .. $ hg clone gitrepo hgrepo | grep -v '^updating' - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -32,7 +32,7 @@ $ cd hgrepo $ hg pull pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 1 git commits new changesets 7fe02317c63d (1 drafts) (run 'hg update' to get a working copy) $ hg phase -r master diff --git a/tests/test-phases-public.t b/tests/test-phases-public.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1waGFzZXMtcHVibGljLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1waGFzZXMtcHVibGljLnQ= 100644 --- a/tests/test-phases-public.t +++ b/tests/test-phases-public.t @@ -24,7 +24,7 @@ cloning with hggit.usephases publishes cloned HEAD $ hg --config hggit.usephases=True clone -U gitrepo hgrepo - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 $ cd hgrepo @@ -78,10 +78,10 @@ #if publish-defaults $ hg pull -r master other pulling from $TESTTMP/gitrepo/.git - importing git objects into hg + importing 1 git commits new changesets 7fe02317c63d 1 local changesets published (run 'hg update' to get a working copy) #else $ hg pull -r master other pulling from $TESTTMP/gitrepo/.git @@ -82,10 +82,10 @@ new changesets 7fe02317c63d 1 local changesets published (run 'hg update' to get a working copy) #else $ hg pull -r master other pulling from $TESTTMP/gitrepo/.git - importing git objects into hg + importing 1 git commits new changesets 7fe02317c63d (1 drafts) (run 'hg update' to get a working copy) #endif @@ -96,10 +96,10 @@ $ hg phase -fd master $ hg pull pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 2 git commits new changesets ca33a262eb46:03769a650ded (1 drafts) 1 local changesets published (run 'hg update' to get a working copy) #else $ hg pull pulling from $TESTTMP/gitrepo @@ -100,10 +100,10 @@ new changesets ca33a262eb46:03769a650ded (1 drafts) 1 local changesets published (run 'hg update' to get a working copy) #else $ hg pull pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 2 git commits new changesets ca33a262eb46:03769a650ded (1 drafts) 2 local changesets published (run 'hg update' to get a working copy) diff --git a/tests/test-pull-after-rebase.t b/tests/test-pull-after-rebase.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1wdWxsLWFmdGVyLXJlYmFzZS50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1wdWxsLWFmdGVyLXJlYmFzZS50 100644 --- a/tests/test-pull-after-rebase.t +++ b/tests/test-pull-after-rebase.t @@ -34,7 +34,7 @@ Clone it and rebase the branch $ hg clone -U repo.git hgrepo - importing git objects into hg + importing 3 git commits new changesets ff7a2f2d8d70:205a004356ef (3 drafts) $ cd hgrepo $ hg log --graph -T '{bookmarks} {rev}:{node}\n' @@ -82,7 +82,7 @@ $ cd hgrepo $ hg pull pulling from $TESTTMP/repo.git - importing git objects into hg + importing 1 git commits 1 new orphan changesets new changesets f4bd265a9d39 (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) diff --git a/tests/test-pull-after-strip.t b/tests/test-pull-after-strip.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1wdWxsLWFmdGVyLXN0cmlwLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1wdWxsLWFmdGVyLXN0cmlwLnQ= 100644 --- a/tests/test-pull-after-strip.t +++ b/tests/test-pull-after-strip.t @@ -20,7 +20,7 @@ $ cd .. clone a tag $ hg clone -r alpha gitrepo hgrepo-a - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -36,7 +36,7 @@ clone a branch $ hg clone -r beta gitrepo hgrepo-b - importing git objects into hg + importing 2 git commits new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -68,7 +68,7 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg pull -r beta pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 1 git commits abort: you appear to have run strip - please run hg git-cleanup [255] $ hg git-cleanup @@ -77,7 +77,7 @@ "adding remote bookmark" message was added in Mercurial 2.3 $ hg pull -r beta | grep -v "adding remote bookmark" pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 2 git commits new changesets 7fe02317c63d:cc1e605d90db (2 drafts) (run 'hg update' to get a working copy) $ hg log --graph diff --git a/tests/test-pull.t b/tests/test-pull.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1wdWxsLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1wdWxsLnQ= 100644 --- a/tests/test-pull.t +++ b/tests/test-pull.t @@ -24,7 +24,7 @@ $ echo "default=$TESTTMP/gitrepo" >> hgrepo/.hg/hgrc $ hg -R hgrepo pull -r t_alpha pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) (run 'hg update' to get a working copy) $ hg -R hgrepo update t_alpha @@ -69,7 +69,7 @@ pull a branch $ hg -R hgrepo pull -r beta pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 1 git commits new changesets 7fe02317c63d (1 drafts) (run 'hg update' to get a working copy) $ hg -R hgrepo log --graph @@ -104,7 +104,7 @@ pull everything else $ hg -R hgrepo pull pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 2 git commits new changesets 678ebee93e38:6f898ad1f3e1 (2 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R hgrepo log --graph @@ -157,7 +157,7 @@ default/beta 1:7fe02317c63d $ hg -R hgrepo pull --config git.pull-prune-remote-branches=false pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 1 git commits new changesets a02330f767a4 (1 drafts) (run 'hg update' to get a working copy) $ hg -R hgrepo tags | grep default/beta @@ -226,7 +226,7 @@ $ cd .. $ hg -R hgrepo pull -r 'releases/*' pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 2 git commits new changesets 218b2d0660d3:a3f95e150b0a (2 drafts) (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R hgrepo log --graph @@ -335,7 +335,7 @@ $ cd .. $ hg -R hgrepo pull pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 3 git commits new changesets 49713da8f665:e103a73f33be (3 drafts) (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R hgrepo heads diff --git a/tests/test-push-detached.t b/tests/test-push-detached.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1wdXNoLWRldGFjaGVkLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1wdXNoLWRldGFjaGVkLnQ= 100644 --- a/tests/test-push-detached.t +++ b/tests/test-push-detached.t @@ -40,7 +40,7 @@ in this case continues to work. $ hg clone gitrepo hgrepo - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !) diff --git a/tests/test-push-to-head.t b/tests/test-push-to-head.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1wdXNoLXRvLWhlYWQudA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1wdXNoLXRvLWhlYWQudA== 100644 --- a/tests/test-push-to-head.t +++ b/tests/test-push-to-head.t @@ -14,7 +14,7 @@ Clone it, and push back to master: $ hg clone gitrepo hgrepo - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) diff --git a/tests/test-push.t b/tests/test-push.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1wdXNoLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1wdXNoLnQ= 100644 --- a/tests/test-push.t +++ b/tests/test-push.t @@ -12,7 +12,7 @@ $ cd .. $ hg clone -u tip gitrepo hgrepo - importing git objects into hg + importing 1 git commits new changesets ff7a2f2d8d70 (1 drafts) updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -73,7 +73,7 @@ $ hg pull 2>&1 | grep -v 'divergent bookmark' pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 1 git commits new changesets 25eed24f5e8f (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) TODO shouldn't need to do this since we're (in theory) pushing master explicitly, @@ -167,7 +167,7 @@ $ cd .. $ hg clone -u tip gitrepo hgrepo-test - importing git objects into hg + importing 5 git commits new changesets ff7a2f2d8d70:ba0476ff1899 (5 drafts) updating to branch default 5 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-renames.t b/tests/test-renames.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1yZW5hbWVzLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1yZW5hbWVzLnQ= 100644 --- a/tests/test-renames.t +++ b/tests/test-renames.t @@ -489,7 +489,7 @@ Clone without findcopiesharder does not find copies from unmodified files $ hg clone gitcopyharder hgnocopyharder - importing git objects into hg + importing 3 git commits new changesets b45d023c6842:ec77ccdbefe0 (3 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) @@ -536,7 +536,7 @@ findcopiesharder finds copies from unmodified files if similarity is met $ hg --config git.findcopiesharder=true clone gitcopyharder hgcopyharder0 - importing git objects into hg + importing 3 git commits new changesets b45d023c6842:9b3099834272 (3 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) @@ -573,7 +573,7 @@ +6 $ hg --config git.findcopiesharder=true --config git.similarity=95 clone gitcopyharder hgcopyharder1 - importing git objects into hg + importing 3 git commits new changesets b45d023c6842:d9d2e8cbf050 (3 drafts) updating to branch default (no-hg57 !) updating to bookmark master (hg57 !) @@ -612,9 +612,9 @@ Config values out of range $ hg --config git.similarity=999 clone gitcopyharder hgcopyharder2 - importing git objects into hg + importing 3 git commits abort: git.similarity must be between 0 and 100 [255] Left-over on Windows with some pack files $ rm -rf hgcopyharder2 $ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2 @@ -616,8 +616,8 @@ abort: git.similarity must be between 0 and 100 [255] Left-over on Windows with some pack files $ rm -rf hgcopyharder2 $ hg --config git.renamelimit=-5 clone gitcopyharder hgcopyharder2 - importing git objects into hg + importing 3 git commits abort: git.renamelimit must be non-negative [255] diff --git a/tests/test-serve-ci.t b/tests/test-serve-ci.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1zZXJ2ZS1jaS50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1zZXJ2ZS1jaS50 100644 --- a/tests/test-serve-ci.t +++ b/tests/test-serve-ci.t @@ -102,7 +102,7 @@ $ hg -R repo-git pull -u pulling from git://git-server/repo.git - importing git objects into hg + importing 1 git commits new changesets fa22339f4ab8 (1 drafts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -121,7 +121,7 @@ > --config auth.git.password=git \ > pull -u pulling from http://git-server/repo.git - importing git objects into hg + importing 1 git commits new changesets fa22339f4ab8 (1 drafts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-serve-dulwich.t b/tests/test-serve-dulwich.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1zZXJ2ZS1kdWx3aWNoLnQ=..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1zZXJ2ZS1kdWx3aWNoLnQ= 100644 --- a/tests/test-serve-dulwich.t +++ b/tests/test-serve-dulwich.t @@ -47,7 +47,7 @@ importing commits 1/2 [================> ]\r (no-eol) (esc) importing commits 2/2 [==================================>]\r (no-eol) (esc) \r (no-eol) (esc) - importing git objects into hg + importing 2 git commits new changesets c4d188f6e13d:221dd250e933 (2 drafts) $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy HG:221dd250e933 GIT:3af9773036a9 diff --git a/tests/test-serve-git.t b/tests/test-serve-git.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1zZXJ2ZS1naXQudA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1zZXJ2ZS1naXQudA== 100644 --- a/tests/test-serve-git.t +++ b/tests/test-serve-git.t @@ -55,7 +55,7 @@ importing commits 1/2 [================> ]\r (no-eol) (esc) importing commits 2/2 [==================================>]\r (no-eol) (esc) \r (no-eol) (esc) - importing git objects into hg + importing 2 git commits new changesets c4d188f6e13d:221dd250e933 (2 drafts) $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -R copy HG:221dd250e933 GIT:3af9773036a9 diff --git a/tests/test-subrepos.t b/tests/test-subrepos.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC1zdWJyZXBvcy50..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC1zdWJyZXBvcy50 100644 --- a/tests/test-subrepos.t +++ b/tests/test-subrepos.t @@ -29,7 +29,7 @@ $ cd .. Ensure gitlinks are transformed to .hgsubstate on hg pull from git $ hg clone -u tip gitrepo1 hgrepo 2>&1 | egrep -v '^(Cloning into|done)' - importing git objects into hg + importing 3 git commits new changesets e532b2bfda10:88c5e06a2a29 (3 drafts) updating to branch default cloning subrepo subrepo1 from $TESTTMP/gitsubrepo @@ -101,7 +101,7 @@ $ cd ../hgrepo $ hg pull pulling from $TESTTMP/gitrepo1 - importing git objects into hg + importing 1 git commits new changesets [0-9a-f]{12,12} \(1 drafts\) (re) (run 'hg update' to get a working copy) $ hg checkout -C diff --git a/tests/test-transactions.t b/tests/test-transactions.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC10cmFuc2FjdGlvbnMudA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC10cmFuc2FjdGlvbnMudA== 100644 --- a/tests/test-transactions.t +++ b/tests/test-transactions.t @@ -120,7 +120,7 @@ $ hg --config hggit.mapsavefrequency=25 pull pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 100 git commits new changesets 1c8407413fa3:abc468b9e51b (25 drafts) new changesets 217c308baf47:d5d14eeedd08 (25 drafts) new changesets d9807ef6abcb:4678067bd500 (25 drafts) @@ -138,7 +138,7 @@ $ hg --config hggit.mapsavefrequency=25 --config hggit.usephases=yes pull pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 100 git commits new changesets 1c8407413fa3:abc468b9e51b (25 drafts) new changesets 217c308baf47:d5d14eeedd08 (25 drafts) new changesets d9807ef6abcb:4678067bd500 (25 drafts) @@ -165,7 +165,7 @@ $ ABORT_AFTER=99 hg pull pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 100 git commits transaction abort! rollback completed abort: aborted after 99 commits! @@ -176,7 +176,7 @@ $ EXIT_AFTER=5 hg --config hggit.mapsavefrequency=10 pull pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 100 git commits transaction abort! rollback completed interrupted! @@ -195,7 +195,7 @@ $ EXIT_AFTER=15 hg --config hggit.mapsavefrequency=10 pull pulling from $TESTTMP/gitrepo - importing git objects into hg + importing 100 git commits new changesets 1c8407413fa3:7c8c534a5fbe (10 drafts) transaction abort! rollback completed @@ -226,7 +226,7 @@ > hg --config hggit.mapsavefrequency=10 --config git.intree=yes \ > --cwd hgrepo \ > clone -U $TESTTMP/gitrepo . - importing git objects into hg + importing 100 git commits transaction abort! rollback completed interrupted! diff --git a/tests/test-tree-decomposition.t b/tests/test-tree-decomposition.t index 88657cbf4eba4c447da484bed9164207a532e883_dGVzdHMvdGVzdC10cmVlLWRlY29tcG9zaXRpb24udA==..c8c091667e0cab45c08dd31e224408e5eaf63a1d_dGVzdHMvdGVzdC10cmVlLWRlY29tcG9zaXRpb24udA== 100644 --- a/tests/test-tree-decomposition.t +++ b/tests/test-tree-decomposition.t @@ -25,7 +25,7 @@ Initialized empty Git repository in $TESTTMP/gitrepo2/ $ hg clone gitrepo hgrepo - importing git objects into hg + importing 3 git commits new changesets d4d3d2417141:541f27994b81 (3 drafts) updating to bookmark master (hg57 !) updating to branch default (no-hg57 !)