Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-bundle-r.out @ 5344:cc34be74eeec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 29 Sep 2007 21:10:54 -0700
parents 30d4d8985dd8
children
line wrap: on
line diff
--- a/tests/test-bundle-r.out
+++ b/tests/test-bundle-r.out
@@ -152,9 +152,9 @@ 1 files updated, 0 files merged, 0 files
 % 2
 2:d62976ca1e50
 adding changesets
-abort: unknown parent ac69c658229d!
 transaction abort!
 rollback completed
+abort: unknown parent ac69c658229d!
 % 2
 2:d62976ca1e50
 adding changesets