# HG changeset patch # User Augie Fackler # Date 1347545866 18000 # Node ID 11fcb096fba972606065a3f9c5d7de3fc4dab52b # Parent 69fac0c00830a4fcef99baf4fc93fae768a527e8 test-git-submodules: update expected output diff --git a/tests/test-git-submodules.t b/tests/test-git-submodules.t old mode 100755 new mode 100644 --- a/tests/test-git-submodules.t +++ b/tests/test-git-submodules.t @@ -82,17 +82,17 @@ $ hg clone gitrepo2 hgrepo | grep -v '^updating' importing git objects into hg - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo $ hg log --graph | grep -v ': *master' - @ changeset: 2:954cdf1c8c82 + @ changeset: 2:76fda365fbbb | tag: default/master | tag: tip | user: test | date: Mon Jan 01 00:00:11 2007 +0000 | summary: rm subrepo | - o changeset: 1:145121c71064 + o changeset: 1:2f69b1b8a6f8 | user: test | date: Mon Jan 01 00:00:11 2007 +0000 | summary: add subrepo @@ -106,4 +106,4 @@ $ echo % we should have some bookmarks % we should have some bookmarks $ hg book - * master 2:954cdf1c8c82 + * master 2:76fda365fbbb