Mercurial > hg

changeset 8960:8a5657ecdaaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Brendan Cully <brendan@kublai.com>
date Mon, 29 Jun 2009 09:00:37 -0700
parents 970506870efb (diff) 8358cf63f612 (current diff)
children c963d49ac7a1
files
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-newbranch.out	Sun Jun 28 13:56:34 2009 +0200
+++ b/tests/test-newbranch.out	Mon Jun 29 09:00:37 2009 -0700
@@ -4,6 +4,13 @@
 % branch shadowing
 abort: a branch of the same name already exists (use --force to override)
 marked working directory as branch default
+% there should be only one default branch head
+changeset:   3:bf1bc2f45e83
+tag:         tip
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     clear branch name
+
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 foo
 created new head
@@ -81,7 +88,6 @@
 
 4:4909a3732169
 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4
-be8523e69bf892e25817fc97187516b3c0804ae4 default
 bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
 67ec16bde7f1575d523313b9bca000f6a6f12dca bar
@@ -91,7 +97,6 @@
 be8523e69bf892e25817fc97187516b3c0804ae4 default
 % pushing everything
 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4
-be8523e69bf892e25817fc97187516b3c0804ae4 default
 bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
 67ec16bde7f1575d523313b9bca000f6a6f12dca bar