[PATCH] test-convert-git: stablize for git 1.7.7.6
Matt Harbison
mharbison72 at gmail.com
Thu Jul 2 00:58:01 UTC 2015
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1435798392 14400
# Wed Jul 01 20:53:12 2015 -0400
# Node ID 3193bcd6f47a2b9be7a00447fefd69de26530f18
# Parent 7f7d4a11332ed38e65691a1a2118e63e57a8eda7
test-convert-git: stablize for git 1.7.7.6
The output has apparently changed slightly since this version. Since they are
just commits without any obvious importance to the test, and I can't figure out
how to glob them away, silence them.
Sample diffs were like this:
@@ -468,7 +468,7 @@
$ git commit -a -m "weird white space submodule"
[master *] weird white space submodule (glob)
Author: nottest <test at example.org>
- 1 file changed, 3 insertions(+)
+ 1 files changed, 3 insertions(+), 0 deletions(-)
$ cd ..
$ hg convert git-repo6 hg-repo6
initializing destination hg-repo6 repository
diff --git a/tests/test-convert-git.t b/tests/test-convert-git.t
--- a/tests/test-convert-git.t
+++ b/tests/test-convert-git.t
@@ -465,10 +465,7 @@
> path = git-repo5
> url = $TESTTMP/git-repo5
> EOF
- $ git commit -a -m "weird white space submodule"
- [master *] weird white space submodule (glob)
- Author: nottest <test at example.org>
- 1 file changed, 3 insertions(+)
+ $ git commit -q -a -m "weird white space submodule"
$ cd ..
$ hg convert git-repo6 hg-repo6
initializing destination hg-repo6 repository
@@ -489,16 +486,8 @@
$ git checkout HEAD .gitmodules
$ git rm .gitmodules
rm '.gitmodules'
- $ git commit -m "remove .gitmodules" .gitmodules
- [master *] remove .gitmodules (glob)
- Author: nottest <test at example.org>
- 1 file changed, 3 deletions(-)
- delete mode 100644 .gitmodules
- $ git commit -m "missing .gitmodules"
- [master *] missing .gitmodules (glob)
- Author: nottest <test at example.org>
- 1 file changed, 1 insertion(+)
- create mode 160000 git-repo4
+ $ git commit -q -m "remove .gitmodules" .gitmodules
+ $ git commit -q -m "missing .gitmodules"
$ cd ..
$ hg convert git-repo6 hg-repo6 --traceback
fatal: Path '.gitmodules' does not exist in '*' (glob)
More information about the Mercurial-devel
mailing list