Mercurial > hg > hg-git

changeset 290:6d2aad2486c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix for new sorting of extra in hg and new topological sort
author Augie Fackler <durin42@gmail.com>
date Wed, 03 Mar 2010 17:47:00 -0600
parents 0f7db04b8191
children b69bda29e65c 09116995c421
files tests/test-hg-branch.out tests/test-octopus.out
diffstat 2 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-hg-branch.out
+++ b/tests/test-hg-branch.out
@@ -14,7 +14,7 @@
 importing Hg objects into Git
 creating and sending data
     default::refs/heads/master => GIT:296802ef
-@  changeset:   2:698615204564
+@  changeset:   2:d93a72262a83
 |  branch:      gamma
 |  tag:         master
 |  tag:         default/master
@@ -23,7 +23,7 @@
 |  date:        Mon Jan 01 00:00:12 2007 +0000
 |  summary:     started branch gamma
 |
-o  changeset:   1:71414c4e3c6f
+o  changeset:   1:a31e374801c9
 |  user:        test
 |  date:        Mon Jan 01 00:00:11 2007 +0000
 |  summary:     rename alpha to beta
@@ -39,7 +39,7 @@
 Total 6 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-o  changeset:   2:698615204564
+o  changeset:   2:d93a72262a83
 |  branch:      gamma
 |  tag:         master
 |  tag:         default/master
@@ -48,7 +48,7 @@
 |  date:        Mon Jan 01 00:00:12 2007 +0000
 |  summary:     started branch gamma
 |
-@  changeset:   1:71414c4e3c6f
+@  changeset:   1:a31e374801c9
 |  user:        test
 |  date:        Mon Jan 01 00:00:11 2007 +0000
 |  summary:     rename alpha to beta
--- a/tests/test-octopus.out
+++ b/tests/test-octopus.out
@@ -3,8 +3,8 @@
 Switched to a new branch "branch1"
 Switched to a new branch "branch2"
 Switched to branch "master"
-Trying simple merge with 9497a4ee62e16ee641860d7677cdb2589ea15554
-Trying simple merge with e5023f9e5cb24fdcec7b6c127cec45d8888e35a9
+Trying simple merge with branch1
+Trying simple merge with branch2
 Merge made by octopus.
  beta  |    1 +
  gamma |    1 +
@@ -30,8 +30,8 @@
 | |  summary:     Merge branches 'branch1' and 'branch2'
 | |
 | o    changeset:   4:7f6c791a169f
-| |\   parent:      2:7bcd915dc873
-| | |  parent:      1:37c124f2d0a0
+| |\   parent:      1:7bcd915dc873
+| | |  parent:      2:37c124f2d0a0
 | | |  user:        test <test@example.org>
 | | |  date:        Mon Jan 01 00:00:13 2007 +0000
 | | |  summary:     Merge branches 'branch1' and 'branch2'
@@ -42,20 +42,20 @@
 | | |  date:        Mon Jan 01 00:00:13 2007 +0000
 | | |  summary:     add delta
 | | |
-+---o  changeset:   2:7bcd915dc873
-| |    tag:         branch1
-| |    tag:         default/branch1
++---o  changeset:   2:37c124f2d0a0
+| |    tag:         branch2
+| |    tag:         default/branch2
 | |    parent:      0:3442585be8a6
 | |    user:        test <test@example.org>
-| |    date:        Mon Jan 01 00:00:11 2007 +0000
-| |    summary:     add beta
+| |    date:        Mon Jan 01 00:00:12 2007 +0000
+| |    summary:     add gamma
 | |
-| o  changeset:   1:37c124f2d0a0
-|/   tag:         branch2
-|    tag:         default/branch2
+| o  changeset:   1:7bcd915dc873
+|/   tag:         branch1
+|    tag:         default/branch1
 |    user:        test <test@example.org>
-|    date:        Mon Jan 01 00:00:12 2007 +0000
-|    summary:     add gamma
+|    date:        Mon Jan 01 00:00:11 2007 +0000
+|    summary:     add beta
 |
 o  changeset:   0:3442585be8a6
    user:        test <test@example.org>