Mercurial > hg

comparison tests/test-convert-git.t @ 26040:97208371715a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-convert-git: work around output format changes in git git version 2.4.3: --- /home/augie/hg/tests/test-convert-git.t +++ /home/augie/hg/tests/test-convert-git.t.err @@ -659,7 +659,7 @@ $ touch a && git add a && git commit -am "commit a" [master (root-commit) 8ae5f69] commit a Author: nottest <test@example.org> 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 a $ cd .. $ git clone git-repo7 git-repo7-client git version 1.7.9.5: --- /home/augie/hg/tests/test-convert-git.t +++ /home/augie/hg/tests/test-convert-git.t.err @@ -659,7 +659,7 @@ $ touch a && git add a && git commit -am "commit a" [master (root-commit) 8ae5f69] commit a Author: nottest <test@example.org> - 1 file changed, 0 insertions(+), 0 deletions(-) + 0 files changed create mode 100644 a $ cd .. $ git clone git-repo7 git-repo7-client I don't know when this changed in git and am too lazy to try and bisect it, so just work around the change.
author Augie Fackler <augie@google.com>
date Mon, 17 Aug 2015 19:03:58 -0400
parents d4e1e947444b
children d9d3d49c4cf7
comparison
equal deleted inserted replaced
26029:563ea14c62d4 26040:97208371715a
654 654
655 convert using a different remote prefix 655 convert using a different remote prefix
656 $ git init git-repo7 656 $ git init git-repo7
657 Initialized empty Git repository in $TESTTMP/git-repo7/.git/ 657 Initialized empty Git repository in $TESTTMP/git-repo7/.git/
658 $ cd git-repo7 658 $ cd git-repo7
659 $ touch a && git add a && git commit -am "commit a" 659 TODO: it'd be nice to use (?) lines instead of grep -v to handle the
660 git output variance, but that doesn't currently work in the middle of
661 a block, so do this for now.
662 $ touch a && git add a && git commit -am "commit a" | grep -v changed
660 [master (root-commit) 8ae5f69] commit a 663 [master (root-commit) 8ae5f69] commit a
661 Author: nottest <test@example.org> 664 Author: nottest <test@example.org>
662 1 file changed, 0 insertions(+), 0 deletions(-)
663 create mode 100644 a 665 create mode 100644 a
664 $ cd .. 666 $ cd ..
665 $ git clone git-repo7 git-repo7-client 667 $ git clone git-repo7 git-repo7-client
666 Cloning into 'git-repo7-client'... 668 Cloning into 'git-repo7-client'...
667 done. 669 done.