[PATCH] Active branches fix (Issue 1104)

Stefano Tortarolo stefano at inventati.org
Wed May 7 11:43:51 CDT 2008


# HG changeset patch
# User Stefano Tortarolo <stefano at inventati.org>
# Date 1210178514 -7200
# Node ID 1ec51d09514bef84b4cdd97c7bc452424437f6cf
# Parent  9dc5f609ca432bacac04fbe7c19e56175252acfd
Corrected test output according to the active branches fix.

diff --git a/tests/test-branches.out b/tests/test-branches.out
--- a/tests/test-branches.out
+++ b/tests/test-branches.out
@@ -5,13 +5,14 @@
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 marked working directory as branch c
+default                        0:19709c5a4e75 (inactive)
+a                              1:dd6b440dd85a
 c                              5:5ca481e59b8c
+b                              4:22df7444f7c1
+-------
 a                              1:dd6b440dd85a
-b                              4:22df7444f7c1 (inactive)
-default                        0:19709c5a4e75 (inactive)
--------
 c                              5:5ca481e59b8c
-a                              1:dd6b440dd85a
+b                              4:22df7444f7c1
 --- Branch a
 changeset:   1:dd6b440dd85a
 branch:      a


More information about the Mercurial-devel mailing list