Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-newbranch.out @ 4602:d9d177ef748a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up tests for new branch message
author Brendan Cully <brendan@kublai.com>
date Mon, 18 Jun 2007 11:13:16 -0700
parents bbc97d419b16
children 66ed92ed115a
comparison
equal deleted inserted replaced
4601:e69da61e467e 4602:d9d177ef748a
1 marked working directory as branch foo
1 foo 2 foo
3 marked working directory as branch bar
2 % branch shadowing 4 % branch shadowing
3 abort: a branch of the same name already exists (use --force to override) 5 abort: a branch of the same name already exists (use --force to override)
6 marked working directory as branch default
4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 7 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 foo 8 foo
6 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
7 (branch merge, don't forget to commit) 10 (branch merge, don't forget to commit)
8 foo 11 foo
81 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo 84 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
82 67ec16bde7f1575d523313b9bca000f6a6f12dca bar 85 67ec16bde7f1575d523313b9bca000f6a6f12dca bar
83 % update with no arguments: tipmost revision of the current branch 86 % update with no arguments: tipmost revision of the current branch
84 bf1bc2f45e83 87 bf1bc2f45e83
85 4909a3732169 (foo) tip 88 4909a3732169 (foo) tip
89 marked working directory as branch foobar
86 abort: branch foobar not found 90 abort: branch foobar not found
87 % fastforward merge 91 % fastforward merge
92 marked working directory as branch ff
88 adding ff 93 adding ff
89 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 94 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
90 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
91 (branch merge, don't forget to commit) 96 (branch merge, don't forget to commit)
92 foo 97 foo