Mercurial > hg
view tests/test-newbranch.out @ 12171:cc39d07d2212
store: Removed extra space in _data list
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 05 Sep 2010 21:00:04 +0200 |
parents | 4c94b6d0fb1c |
children |
line wrap: on
line source
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 'hg update' to switch to it) marked working directory as branch default created new head % there should be only one default branch head changeset: 3:9d567d0b51f9 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: clear branch name 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 (branch merge, don't forget to commit) foo changeset: 5:dc140083783b branch: foo tag: tip parent: 4:98d14f698afe parent: 3:9d567d0b51f9 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: merge changeset: 4:98d14f698afe branch: foo parent: 1:0079f24813e2 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: modify a branch changeset: 3:9d567d0b51f9 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: clear branch name changeset: 2:ed2bbf4e0102 branch: bar user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: change branch name changeset: 1:0079f24813e2 branch: foo user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add branch name changeset: 0:db01e8ea3388 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: initial foo 5:dc140083783b default 3:9d567d0b51f9 (inactive) bar 2:ed2bbf4e0102 (inactive) foo default bar % test for invalid branch cache rolling back to revision 4 (undo commit) changeset: 4:98d14f698afe branch: foo tag: tip parent: 1:0079f24813e2 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: modify a branch invalidating branch cache (tip differs) changeset: 4:98d14f698afeaff8cb612dcf215ce95e639effc3 branch: foo tag: tip parent: 1:0079f24813e2b73a891577c243684c5066347bc8 parent: -1:0000000000000000000000000000000000000000 manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a user: test date: Thu Jan 01 00:00:00 1970 +0000 files: a extra: branch=foo description: modify a branch 4:98d14f698afe 98d14f698afeaff8cb612dcf215ce95e639effc3 4 9d567d0b51f9e2068b054e1948e1a927f99b5874 default 98d14f698afeaff8cb612dcf215ce95e639effc3 foo ed2bbf4e01029020711be82ca905283e883f0e11 bar % push should update the branch cache % pushing just rev 0 db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 0 db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 default % pushing everything 98d14f698afeaff8cb612dcf215ce95e639effc3 4 9d567d0b51f9e2068b054e1948e1a927f99b5874 default 98d14f698afeaff8cb612dcf215ce95e639effc3 foo ed2bbf4e01029020711be82ca905283e883f0e11 bar % update with no arguments: tipmost revision of the current branch 9d567d0b51f9 98d14f698afe (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 (branch merge, don't forget to commit) foo changeset: 6:917eb54e1b4b branch: foo tag: tip parent: 4:98d14f698afe parent: 5:6683a60370cb user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Merge ff into foo a ff % test merging, add 3 default heads and one test head adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding c created new head 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding d created new head 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch test adding e changeset: 4:3a1e01ed1df4 branch: test tag: tip parent: 0:cb9a9f314b8b user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: e changeset: 3:980f7dc84c29 parent: 0:cb9a9f314b8b user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: d changeset: 2:d36c0562f908 parent: 0:cb9a9f314b8b user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: c changeset: 1:d2ae7f538514 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: b changeset: 0:cb9a9f314b8b user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: a % implicit merge with test branch as parent abort: branch 'test' has one head - please merge with an explicit rev (run 'hg heads' to see all heads) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved % implicit merge with default branch as parent abort: branch 'default' has 3 heads - please merge with an explicit rev (run 'hg heads .' to see heads) % 3 branch heads, explicit merge required 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % 2 branch heads, implicit merge works 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)