view tests/test-merge8.t @ 26040:97208371715a stable

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 <[e-mail]>
    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 <[e-mail]>
-   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.

Test for changeset ba7c74081861
(update dirstate correctly for non-branchmerge updates)
  $ hg init a
  $ cd a
  $ echo a > a
  $ hg add a
  $ hg commit -m a
  $ cd ..
  $ hg clone a b
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd a
  $ hg mv a b
  $ hg commit -m move
  $ echo b >> b
  $ hg commit -m b
  $ cd ../b
  $ hg pull ../a
  pulling from ../a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 2 changesets with 2 changes to 1 files
  (run 'hg update' to get a working copy)
  $ hg update
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ cd ..