Patchwork D1935: tests: update test to work with Git 2.16

login
register
mail settings
Submitter phabricator
Date Jan. 22, 2018, 8:55 p.m.
Message ID <1ff653e3fd73965ad365739cfe72bbd0@localhost.localdomain>
Download mbox | patch
Permalink /patch/27045/
State Not Applicable
Headers show

Comments

phabricator - Jan. 22, 2018, 8:55 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8144f1b07e21: tests: update test to work with Git 2.16 (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1935?vs=4991&id=4992

REVISION DETAIL
  https://phab.mercurial-scm.org/D1935

AFFECTED FILES
  tests/test-subrepo-git.t

CHANGE DETAILS




To: indygreg, #hg-reviewers, spectral, martinvonz
Cc: spectral, mercurial-devel

Patch

diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -320,7 +320,7 @@ 
   $ hg up
   From $TESTTMP/tb/s
    * [new branch]      b2         -> origin/b2
-  Previous HEAD position was f47b465... merge
+  Previous HEAD position was f47b465* merge (glob)
   Switched to a new branch 'b2'
   pulling subrepo s from $TESTTMP/tb/s
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -572,8 +572,8 @@ 
   $ cd ..
   $ cd s
   $ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc
-  Previous HEAD position was 32a3438... fff
-  HEAD is now at aa84837... f
+  Previous HEAD position was 32a3438* fff (glob)
+  HEAD is now at aa84837* f (glob)
   $ cd ..
   $ hg update 1
    subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1)
@@ -623,11 +623,11 @@ 
 Test subrepo already at intended revision:
   $ cd s
   $ git checkout 32a343883b74769118bb1d3b4b1fbf9156f4dddc
-  HEAD is now at 32a3438... fff
+  HEAD is now at 32a3438* fff (glob)
   $ cd ..
   $ hg update 1
-  Previous HEAD position was 32a3438... fff
-  HEAD is now at da5f5b1... g
+  Previous HEAD position was 32a3438* fff (glob)
+  HEAD is now at da5f5b1* g (glob)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -n
   1