File fix-tests-expecting-different-git-output.patch of Package mercurial-extension-hg-git

Overview Repositories Revisions Requests Users Attributes Meta

File fix-tests-expecting-different-git-output.patch of Package mercurial-extension-hg-git (Revision b3294a9a15cf870b3563fa409f38dfd4)

Currently displaying revision b3294a9a15cf870b3563fa409f38dfd4 , Show latest

diff --git a/tests/test-hg-author.t b/tests/test-hg-author.t
--- a/tests/test-hg-author.t
+++ b/tests/test-hg-author.t
@@ -15,7 +15,7 @@
   $ git push --set-upstream origin master
   To $TESTTMP/repo.git
    * [new branch]      master -> master
-  Branch 'master' set up to track remote branch 'master' from 'origin'.
+  branch 'master' set up to track 'origin/master'.
 
   $ cd ..
   $ hg clone repo.git hgrepo
diff --git a/tests/test-hg-tags.t b/tests/test-hg-tags.t
--- a/tests/test-hg-tags.t
+++ b/tests/test-hg-tags.t
@@ -15,7 +15,7 @@
   $ git push --set-upstream origin master
   To $TESTTMP/repo.git
    * [new branch]      master -> master
-  Branch 'master' set up to track remote branch 'master' from 'origin'.
+  branch 'master' set up to track 'origin/master'.
 
   $ cd ..
   $ hg clone -U repo.git hgrepo
diff --git a/tests/test-orphan-tags.t b/tests/test-orphan-tags.t
--- a/tests/test-orphan-tags.t
+++ b/tests/test-orphan-tags.t
@@ -37,7 +37,7 @@
   $ git push --set-upstream origin the_branch
   To $TESTTMP/git.bare
    * [new branch]      the_branch -> the_branch
-  Branch 'the_branch' set up to track remote branch 'the_branch' from 'origin'.
+  branch 'the_branch' set up to track 'origin/the_branch'.
   $ git push --tags
   To $TESTTMP/git.bare
    * [new tag]         the_tag -> the_tag
diff --git a/tests/test-illegal-contents.t b/tests/test-illegal-contents.t
--- a/tests/test-illegal-contents.t
+++ b/tests/test-illegal-contents.t
@@ -119,7 +119,8 @@
   warning: path 'nested/.hg/00changelog.i' is within a nested repository, which Mercurial cannot check out.
   warning: path 'nested/.hg/requires' is within a nested repository, which Mercurial cannot check out.
   updating to branch default (no-hg57 !)
-  updating to bookmark master (hg57 !)
+  warning: path 'nested/.hg/store/requires' is within a nested repository, which Mercurial cannot check out.
+  updating to bookmark master
   abort: path 'nested/.hg/00changelog.i' is inside nested repo 'nested'
   [255]
   $ cd ..
diff --git a/tests/test-git-tags.t b/tests/test-git-tags.t
--- a/tests/test-git-tags.t
+++ b/tests/test-git-tags.t
@@ -180,6 +180,7 @@
   $ touch gamma
   $ fn_hg_commit -A -m 'add gamma'
   $ hg tag --git gamma --debug -r tip
+  invalid branch cache (visible): tip differs
   adding git tag gamma
   finding hg commits to export
   exporting hg objects to git

Places

File fix-tests-expecting-different-git-output.patch of Package mercurial-extension-hg-git (Revision b3294a9a15cf870b3563fa409f38dfd4)

Places