Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-backout.out @ 2303:78e7fd16f472

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Corrected tests for commit now consistently stripping last newline.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 17 May 2006 19:59:15 +0200
parents 6c9305fbebaf
children 8fe3d60b7f19
line wrap: on
line diff
--- a/tests/test-backout.out
+++ b/tests/test-backout.out
@@ -1,19 +1,19 @@
 # basic operation
 adding a
-changeset 2:c86754337410 backs out changeset 1:a820f4f40a57
+changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57
 a
 # file that was removed is recreated
 adding a
 adding a
-changeset 2:d2d961bd79f2 backs out changeset 1:76862dcce372
+changeset 2:44cd84c7349a backs out changeset 1:76862dcce372
 content
 # backout of backout is as if nothing happened
 removing a
-changeset 3:8a7eeb5ab5ce backs out changeset 2:d2d961bd79f2
+changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a
 cat: a: No such file or directory
 # backout with merge
 adding a
-changeset 3:3c9e845b409c backs out changeset 1:314f55b1bf23
+changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23
 merging with changeset 2:b66ea5b77abb
 merging a
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved