Mercurial > hg > mercurial-crew-with-dirclash
changeset 4602:d9d177ef748a
Fix up tests for new branch message
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Mon, 18 Jun 2007 11:13:16 -0700 |
| parents | e69da61e467e |
| children | 66ed92ed115a 0f6853c15606 |
| files | tests/test-encoding.out tests/test-impexp-branch.out tests/test-newbranch.out |
| diffstat | 3 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-encoding.out +++ b/tests/test-encoding.out @@ -13,6 +13,7 @@ abort: decoding near ' encoded: é': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)! transaction abort! rollback completed % these should work +marked working directory as branch é % ascii changeset: 5:db5520b4645f branch: ?
--- a/tests/test-impexp-branch.out +++ b/tests/test-impexp-branch.out @@ -1,3 +1,4 @@ +marked working directory as branch abranch applying patch from stdin applying patch from stdin applying patch from stdin
--- a/tests/test-newbranch.out +++ b/tests/test-newbranch.out @@ -1,6 +1,9 @@ +marked working directory as branch foo foo +marked working directory as branch bar % branch shadowing abort: a branch of the same name already exists (use --force to override) +marked working directory as branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved foo 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -83,8 +86,10 @@ 67ec16bde7f1575d523313b9bca000f6a6f12dca % update with no arguments: tipmost revision of the current branch bf1bc2f45e83 4909a3732169 (foo) tip +marked working directory as branch foobar abort: branch foobar not found % fastforward merge +marked working directory as branch ff adding ff 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved