Mercurial > hg
changeset 6336:4b0c9c674707
warn about new heads on commit (issue842)
line wrap: on
line diff
--- a/mercurial/commands.py Fri Mar 21 00:55:53 2008 +0100 +++ b/mercurial/commands.py Fri Mar 21 11:06:02 2008 +0100 @@ -547,7 +547,11 @@ def commitfunc(ui, repo, files, message, match, opts): return repo.commit(files, message, opts['user'], opts['date'], match, force_editor=opts.get('force_editor')) + + heads = repo.changelog.heads() cmdutil.commit(ui, repo, commitfunc, pats, opts) + if len(repo.changelog.heads()) > len(heads): + ui.status(_('created new head\n')) def copy(ui, repo, *pats, **opts): """mark files as copied for the next commit
--- a/tests/test-add.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-add.out Fri Mar 21 11:06:02 2008 +0100 @@ -13,6 +13,7 @@ % should fail a already tracked! 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head merging a warning: conflicts during merge. merging a failed!
--- a/tests/test-annotate.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-annotate.out Fri Mar 21 11:06:02 2008 +0100 @@ -46,6 +46,7 @@ 3 b:5: b5 3 b:6: b6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -64,6 +65,7 @@ 4 b:5: c 3 b:5: b5 0 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)
--- a/tests/test-backout.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-backout.out Fri Mar 21 11:06:02 2008 +0100 @@ -21,10 +21,12 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved abort: cannot back out change on a different branch adding c +created new head abort: cannot back out change on a different branch # backout with merge adding a reverting a +created new head changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182 merging with changeset 3:26b8ccb9ad91 merging a @@ -37,6 +39,7 @@ adding a adding b reverting a +created new head changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5 the backout changeset is a new head - do not forget to merge (use "backout --merge" if you want to auto-merge) @@ -47,6 +50,7 @@ adding c 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding d +created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) # backout of merge should fail @@ -69,6 +73,7 @@ marked working directory as branch branch2 adding file2 removing file1 +created new head changeset 3:f1c642b1d8e5 backs out changeset 1:bf1602f437f3 the backout changeset is a new head - do not forget to merge (use "backout --merge" if you want to auto-merge)
--- a/tests/test-bheads.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-bheads.out Fri Mar 21 11:06:02 2008 +0100 @@ -9,6 +9,7 @@ ======= 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch b +created new head 2: Adding b branch 1: Adding a branch ------- @@ -20,6 +21,7 @@ 3: Adding b branch head 1 ======= 0 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head 4: Adding b branch head 2 3: Adding b branch head 1 1: Adding a branch @@ -28,6 +30,7 @@ 3: Adding b branch head 1 ======= 0 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head 5: Adding b branch head 3 4: Adding b branch head 2 3: Adding b branch head 1
--- a/tests/test-branches.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-branches.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,7 +1,9 @@ marked working directory as branch a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch b +created new head 0 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head marked working directory as branch c c 5:5ca481e59b8c a 1:dd6b440dd85a
--- a/tests/test-bundle-r.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-bundle-r.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,4 +1,5 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 2 files removed, 0 files unresolved rev offset length base linkrev nodeid p1 p2 0 0 3 0 0 362fef284ce2 000000000000 000000000000
--- a/tests/test-bundle.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-bundle.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,5 +1,6 @@ ====== Setting up test 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 2 files removed, 0 files unresolved checking changesets checking manifests
--- a/tests/test-changelog-exec.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-changelog-exec.out Fri Mar 21 11:06:02 2008 +0100 @@ -2,6 +2,7 @@ bar foo +created new head % manifest of p1: foo 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-clone-r.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-clone-r.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,4 +1,5 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 2 files removed, 0 files unresolved rev offset length base linkrev nodeid p1 p2 0 0 3 0 0 362fef284ce2 000000000000 000000000000
--- a/tests/test-command-template.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-command-template.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,4 +1,6 @@ +created new head 0 files updated, 0 files merged, 4 files removed, 0 files unresolved +created new head # default style is like normal output # normal # verbose
--- a/tests/test-conflict.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-conflict.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,4 +1,5 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head merging a warning: conflicts during merge. merging a failed!
--- a/tests/test-confused-revert.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-confused-revert.out Fri Mar 21 11:06:02 2008 +0100 @@ -8,6 +8,7 @@ ? b 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head merging a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)
--- a/tests/test-convert-datesort.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-convert-datesort.out Fri Mar 21 11:06:02 2008 +0100 @@ -3,6 +3,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved marked working directory as branch branchb adding b +created new head 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % convert with datesort
--- a/tests/test-convert-filemap.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-convert-filemap.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,3 +1,5 @@ +created new head +created new head @ 8 "8: change foo" files: foo | o 7 "7: second merge; change bar" files: bar baz
--- a/tests/test-convert-hg-source.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-convert-hg-source.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,3 +1,4 @@ +created new head merging baz and foo 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -5,6 +6,7 @@ merging foo and baz 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) +created new head initializing destination new repository scanning source... sorting...
--- a/tests/test-convert-svn-sink.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-convert-svn-sink.out Fri Mar 21 11:06:02 2008 +0100 @@ -258,6 +258,7 @@ adding left-2 1 files updated, 0 files merged, 2 files removed, 0 files unresolved adding right-1 +created new head adding right-2 3 files updated, 0 files merged, 2 files removed, 0 files unresolved merging b
--- a/tests/test-debugindexdot.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-debugindexdot.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,3 +1,4 @@ +created new head digraph G { -1 -> 0 0 -> 1
--- a/tests/test-double-merge.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-double-merge.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,3 +1,4 @@ +created new head resolving manifests overwrite None partial False ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9
--- a/tests/test-empty-file.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-empty-file.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,4 +1,5 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head changeset: 2:62ec0e86d1e5 tag: tip parent: 0:567dde5e6e98
--- a/tests/test-empty-group.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-empty-group.out Fri Mar 21 11:06:02 2008 +0100 @@ -4,11 +4,13 @@ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved adding x adding y +created new head 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) +created new head requesting all changes adding changesets adding manifests
--- a/tests/test-excessive-merge.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-excessive-merge.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,9 +1,11 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) +created new head changeset: 4:f6c172c6198c tag: tip parent: 1:448a8c5e42f1
--- a/tests/test-extdiff.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-extdiff.out Fri Mar 21 11:06:02 2008 +0100 @@ -26,6 +26,7 @@ use "hg -v help falabala" to show global options diffing a.8a5febb7f867/a a.34eed99112ab/a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 1 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)
--- a/tests/test-glog.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-glog.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,6 +1,11 @@ % init % empty repo % building tree +created new head +created new head +created new head +created new head +created new head % glog -q @ 34:0eed7cd895e0 |
--- a/tests/test-hook.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-hook.out Fri Mar 21 11:06:02 2008 +0100 @@ -15,6 +15,7 @@ 2:1324a5531bac commit hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b commit.b hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b +created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) precommit hook: HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2
--- a/tests/test-http-clone-r.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-http-clone-r.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,5 +1,6 @@ # creating 'remote' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 2 files removed, 0 files unresolved rev offset length base linkrev nodeid p1 p2 0 0 3 0 0 362fef284ce2 000000000000 000000000000
--- a/tests/test-imerge.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-imerge.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,6 +1,7 @@ adding bar adding foo 1 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head % start imerge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)
--- a/tests/test-import.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-import.out Fri Mar 21 11:06:02 2008 +0100 @@ -174,6 +174,7 @@ % test fuzziness adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head applying tip.patch patching file a Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines).
--- a/tests/test-issue612.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-issue612.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,6 +1,7 @@ adding src/a.c moving src/a.c to source/a.c 1 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head ? src/a.o merging src/a.c and source/a.c 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-issue672.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-issue672.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,6 +1,7 @@ adding 1 adding 2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head resolving manifests overwrite None partial False ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c @@ -17,6 +18,7 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 1 files removed, 0 files unresolved resolving manifests overwrite None partial False
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue842 Fri Mar 21 11:06:02 2008 +0100 @@ -0,0 +1,20 @@ +hg init test +cd test +echo foo > a +hg ci -Ama + +hg up -r0000 +echo bar > a +echo % should issue warning +hg ci -Amb + +hg up -r0000 +echo stuffy > a +echo % should not issue warning +hg ci -q -Amc + +hg up -r0000 +echo crap > a +hg branch testing +echo % should not issue warning +hg ci -q -Amd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue842.out Fri Mar 21 11:06:02 2008 +0100 @@ -0,0 +1,10 @@ +adding a +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +% should issue warning +adding a +created new head +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +% should not issue warning +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +marked working directory as branch testing +% should not issue warning
--- a/tests/test-log.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-log.out Fri Mar 21 11:06:02 2008 +0100 @@ -85,6 +85,7 @@ % log copies, non-linear manifest 1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding foo +created new head 5 e (dir/b) % log copies, execute bit set 6 @@ -106,6 +107,7 @@ adding base 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b1 +created new head % log -f changeset: 3:e62f78d544b4 tag: tip @@ -126,6 +128,7 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding b2 +created new head % log -f -r 1:tip changeset: 1:3d5bf5654eda user: test
--- a/tests/test-merge-commit.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge-commit.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,4 +1,5 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head merging bar and foo 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -14,6 +15,7 @@ 0 0 7 0 0 690b295714ae 000000000000 000000000000 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 4:2d2f9a22c82b 2:0a3ab4856510 3:7d3b554bfdf1 2:0a3ab4856510 1:5cd961e4045d 2:0a3ab4856510 0:2665aaee66e9 @@ -62,6 +64,7 @@ 0 0 7 0 0 690b295714ae 000000000000 000000000000 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 4:2d2f9a22c82b 2:0a3ab4856510 3:96ab80c60897 1:5cd961e4045d 2:0a3ab4856510 2:0a3ab4856510 0:2665aaee66e9
--- a/tests/test-merge-default.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge-default.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,6 +1,8 @@ adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail because not at a head abort: repo has 3 heads - please merge with an explicit rev
--- a/tests/test-merge-force.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge-force.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,3 +1,4 @@ +created new head % local deleted a file, remote removed abort: outstanding uncommitted changes resolving manifests
--- a/tests/test-merge-prompt.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge-prompt.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,6 +1,7 @@ adding file1 adding file2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head # non-interactive merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-merge-remove.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge-remove.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,3 +1,4 @@ +created new head merging foo1 and foo 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)
--- a/tests/test-merge-types.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge-types.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,5 +1,6 @@ adding a 0 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head resolving manifests overwrite None partial False ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
--- a/tests/test-merge1.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge1.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,4 +1,5 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head %% no merges expected 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -9,6 +10,7 @@ +This is file b1 M b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head %% merge should fail abort: untracked file in working directory differs from file in requested revision: 'b' %% merge of b expected @@ -24,6 +26,7 @@ M b %% 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head Contents of b should be "this is file b1" This is file b1 %% merge fails @@ -39,6 +42,7 @@ +This is file b22 M b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head %% merge of b should fail abort: outstanding uncommitted changes %% merge of b expected
--- a/tests/test-merge2.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge2.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,5 +1,8 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b +created new head 0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b +created new head
--- a/tests/test-merge4.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge4.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,3 +1,4 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)
--- a/tests/test-merge5.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge5.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,3 +1,4 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b +created new head abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
--- a/tests/test-merge9.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge9.out Fri Mar 21 11:06:02 2008 +0100 @@ -2,6 +2,7 @@ adding foo adding quux1 adding quux2 +created new head merging bar merging bar failed! merging foo and baz
--- a/tests/test-mq-merge.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-mq-merge.out Fri Mar 21 11:06:02 2008 +0100 @@ -3,6 +3,7 @@ copy .hg/patches to .hg/patches.1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved M b +created new head a b merging with queue at: .hg/patches.1
--- a/tests/test-mq.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-mq.out Fri Mar 21 11:06:02 2008 +0100 @@ -323,6 +323,7 @@ copy from new copy to copy 1 files updated, 0 files merged, 2 files removed, 0 files unresolved +created new head 2 files updated, 0 files merged, 1 files removed, 0 files unresolved adding branch adding changesets @@ -401,6 +402,7 @@ 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus % strip again 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head merging foo 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)
--- a/tests/test-mv-cp-st-diff.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-mv-cp-st-diff.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,3 +1,4 @@ +created new head ** rename in working dir ** ** add a a1 / add a a2 / hg mv a b - working to parent: @@ -96,6 +97,7 @@ +m2 +created new head ** copy in working dir ** ** add a a1 / add a a2 / hg cp a b - working to parent: @@ -211,6 +213,7 @@ +m2 +created new head ** single rename ** ** hg mv a b / add b b1 / add b w - working to parent: @@ -324,6 +327,7 @@ +m2 +created new head ** single copy ** ** hg cp a b / add b b1 / add a w - working to parent: @@ -472,6 +476,7 @@ -b1 +created new head ** rename chain ** ** hg mv a b / hg mv b c / hg mv c d - working to parent: @@ -574,6 +579,7 @@ +m2 +created new head ** copy chain ** ** hg cp a b / hg cp b c / hg cp c d - working to parent: @@ -793,6 +799,7 @@ -5 +created new head ** circular rename ** ** add a a1 / hg mv a b / hg mv b a - working to parent:
--- a/tests/test-newbranch.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-newbranch.out Fri Mar 21 11:06:02 2008 +0100 @@ -6,6 +6,7 @@ marked working directory as branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved foo +created new head 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) foo
--- a/tests/test-parents.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-parents.out Fri Mar 21 11:06:02 2008 +0100 @@ -4,6 +4,7 @@ adding c 1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding c +created new head 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % hg parents changeset: 3:02d851b7e549
--- a/tests/test-parse-date.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-parse-date.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,4 +1,5 @@ reverting a +created new head changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8 merging with changeset 3:107ce1ee2b43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-push-r.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-push-r.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,4 +1,5 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 2 files removed, 0 files unresolved rev offset length base linkrev nodeid p1 p2 0 0 3 0 0 362fef284ce2 000000000000 000000000000
--- a/tests/test-push-warn.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-push-warn.out Fri Mar 21 11:06:02 2008 +0100 @@ -25,7 +25,9 @@ adding foo 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head merging foo 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)
--- a/tests/test-rename-dir-merge.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-rename-dir-merge.out Fri Mar 21 11:06:02 2008 +0100 @@ -4,6 +4,7 @@ moving a/a to b/a moving a/b to b/b 2 files updated, 0 files merged, 2 files removed, 0 files unresolved +created new head resolving manifests overwrite None partial False ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80 @@ -70,4 +71,5 @@ A b/c a/c ? b/d +created new head b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
--- a/tests/test-rename-merge1.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-rename-merge1.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,5 +1,6 @@ checkout 2 files updated, 0 files merged, 2 files removed, 0 files unresolved +created new head merge resolving manifests overwrite None partial False
--- a/tests/test-rename-merge2.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-rename-merge2.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,3 +1,4 @@ +created new head -------------- test L:up a R:nc a b W: - 1 get local a to b -------------- @@ -28,6 +29,7 @@ C a -------------- +created new head -------------- test L:nc a b R:up a W: - 2 get rem change to a and b -------------- @@ -59,6 +61,7 @@ a -------------- +created new head -------------- test L:up a R:nm a b W: - 3 get local a change to b, remove a -------------- @@ -89,6 +92,7 @@ a -------------- +created new head -------------- test L:nm a b R:up a W: - 4 get remote change to b -------------- @@ -117,6 +121,7 @@ a -------------- +created new head -------------- test L: R:nc a b W: - 5 get b -------------- @@ -142,6 +147,7 @@ C a -------------- +created new head -------------- test L:nc a b R: W: - 6 nothing -------------- @@ -165,6 +171,7 @@ C b -------------- +created new head -------------- test L: R:nm a b W: - 7 get b -------------- @@ -191,6 +198,7 @@ M b -------------- +created new head -------------- test L:nm a b R: W: - 8 nothing -------------- @@ -213,6 +221,7 @@ C b -------------- +created new head -------------- test L:um a b R:um a b W: - 9 do merge with ancestor in a -------------- @@ -234,6 +243,7 @@ M b -------------- +created new head -------------- test L:nm a b R:nm a c W: - 11 get c, keep b -------------- @@ -266,6 +276,7 @@ C b -------------- +created new head -------------- test L:nc a b R:up b W: - 12 merge b no ancestor -------------- @@ -288,6 +299,7 @@ C a -------------- +created new head -------------- test L:up b R:nm a b W: - 13 merge b no ancestor -------------- @@ -311,6 +323,7 @@ M b -------------- +created new head -------------- test L:nc a b R:up a b W: - 14 merge b no ancestor -------------- @@ -335,6 +348,7 @@ M b -------------- +created new head -------------- test L:up b R:nm a b W: - 15 merge b no ancestor, remove a -------------- @@ -358,6 +372,7 @@ M b -------------- +created new head -------------- test L:nc a b R:up a b W: - 16 get a, merge b no ancestor -------------- @@ -382,6 +397,7 @@ M b -------------- +created new head -------------- test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor -------------- @@ -404,6 +420,7 @@ C a -------------- +created new head -------------- test L:nm a b R:up a b W: - 18 merge b no ancestor -------------- @@ -428,6 +445,7 @@ M b -------------- +created new head -------------- test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a -------------- @@ -450,6 +468,7 @@ C a -------------- +created new head -------------- test L:up a R:um a b W: - 20 merge a and b to b, remove a -------------- @@ -479,6 +498,7 @@ a -------------- +created new head -------------- test L:um a b R:up a W: - 21 merge a and b to b -------------- @@ -506,6 +526,7 @@ a -------------- +created new head -------------- test L:nm a b R:up a c W: - 23 get c, keep b --------------
--- a/tests/test-revert.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-revert.out Fri Mar 21 11:06:02 2008 +0100 @@ -68,6 +68,7 @@ reverting a %% issue332 adding b/b +created new head reverting b/b forgetting newdir/newfile reverting b/b
--- a/tests/test-revlog-packentry.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-revlog-packentry.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,6 +1,7 @@ adding foo 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding foo +created new head rev offset length base linkrev nodeid p1 p2 0 0 0 0 0 b80de5d13875 000000000000 000000000000 1 0 24 0 1 0376abec49b8 000000000000 000000000000
--- a/tests/test-ssh-clone-r.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-ssh-clone-r.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,5 +1,6 @@ # creating 'remote' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 2 files removed, 0 files unresolved rev offset length base linkrev nodeid p1 p2 0 0 3 0 0 362fef284ce2 000000000000 000000000000
--- a/tests/test-ssh.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-ssh.out Fri Mar 21 11:06:02 2008 +0100 @@ -70,6 +70,7 @@ checking files 2 files, 2 changesets, 3 total revisions bleah +created new head # push should succeed even though it has an unexpected response pushing to ssh://user@dummy/remote searching for changes
--- a/tests/test-tags.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-tags.out Fri Mar 21 11:06:02 2008 +0100 @@ -13,6 +13,7 @@ 0acdaf898367+ first 0acdaf898367+ first M a +created new head 8216907a933d tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -21,6 +22,7 @@ tip 6:e2174d339386 first 0:0acdaf898367 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head .hgtags@c071f74ab5eb, line 2: cannot parse entry .hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed .hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed @@ -40,6 +42,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head tip 4:36195b728445 bar 1:b204a97e6e8d changeset: 5:57e1983b4a60 @@ -60,6 +63,7 @@ tip 5:d8bb4d1eff25 bar 0:b409d9da318e 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head tip 6:b5ff9d142648 bar 0:b409d9da318e abort: tag 'bar' already exists (use -f to force)
--- a/tests/test-transplant.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-transplant.out Fri Mar 21 11:06:02 2008 +0100 @@ -2,6 +2,7 @@ adding r2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding b1 +created new head adding b2 adding b3 4 b3 @@ -100,6 +101,7 @@ removing toremove adding bar 2 files updated, 0 files merged, 2 files removed, 0 files unresolved +created new head applying a1e30dd1b8e7 patching file foo Hunk #1 FAILED at 0
--- a/tests/test-up-local-change.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-up-local-change.out Fri Mar 21 11:06:02 2008 +0100 @@ -95,6 +95,7 @@ +abc 1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding b +created new head M a changeset: 1:802f095af299 user: test
--- a/tests/test-update-reverse.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-update-reverse.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,6 +1,7 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved Main should be gone a +created new head changeset: 3:ded32b0db104 tag: tip user: test