Mercurial > hg
changeset 2175:b2ae81a7df29
Make hg update more verbose by default (issue12)
(including small changes to revert and backout to not show these stats
with the exception of backout --merge)
Show update stats (unless -q), e.g.:
K files updated, L files merged, M files removed, N files unresolved
Inform the user what to do after a merge:
(branch merge, don't forget to commit)
Inform the user what to do if a branch merge failed:
There are unresolved merges, you can redo the full merge using:
hg update -C X
hg merge Y
Inform the user what to do if a working directory merge failed:
There are unresolved merges with locally modified files.
line wrap: on
line diff
--- a/mercurial/commands.py Mon May 01 19:17:34 2006 +0200 +++ b/mercurial/commands.py Tue May 02 18:44:02 2006 +0200 @@ -956,7 +956,7 @@ raise util.Abort(_('cannot back out a change with no parents')) if p2 != nullid: raise util.Abort(_('cannot back out a merge')) - repo.update(node, force=True) + repo.update(node, force=True, show_stats=False) revert_opts = opts.copy() revert_opts['rev'] = hex(parent) revert(ui, repo, **revert_opts) @@ -2518,7 +2518,8 @@ update[abs] = True repo.dirstate.forget(forget[0]) - r = repo.update(node, False, True, update.has_key, False, wlock=wlock) + r = repo.update(node, False, True, update.has_key, False, wlock=wlock, + show_stats=False) repo.dirstate.update(add[0], 'a') repo.dirstate.update(undelete[0], 'n') repo.dirstate.update(remove[0], 'r')
--- a/mercurial/localrepo.py Mon May 01 19:17:34 2006 +0200 +++ b/mercurial/localrepo.py Tue May 02 18:44:02 2006 +0200 @@ -1540,7 +1540,7 @@ return newheads - oldheads + 1 def update(self, node, allow=False, force=False, choose=None, - moddirstate=True, forcemerge=False, wlock=None): + moddirstate=True, forcemerge=False, wlock=None, show_stats=True): pl = self.dirstate.parents() if not force and pl[1] != nullid: self.ui.warn(_("aborting: outstanding uncommitted merges\n")) @@ -1808,14 +1808,27 @@ if moddirstate: self.dirstate.setparents(p1, p2) - stat = ((len(get), _("updated")), - (len(merge) - len(failedmerge), _("merged")), - (len(remove), _("removed")), - (len(failedmerge), _("unresolved"))) - note = ", ".join([_("%d files %s") % s for s in stat]) - self.ui.note("%s\n" % note) - if moddirstate and branch_merge: - self.ui.note(_("(branch merge, don't forget to commit)\n")) + if show_stats: + stats = ((len(get), _("updated")), + (len(merge) - len(failedmerge), _("merged")), + (len(remove), _("removed")), + (len(failedmerge), _("unresolved"))) + note = ", ".join([_("%d files %s") % s for s in stats]) + self.ui.status("%s\n" % note) + if moddirstate: + if branch_merge: + if failedmerge: + self.ui.status(_("There are unresolved merges," + " you can redo the full merge using:\n" + " hg update -C %s\n" + " hg merge %s\n" + % (self.changelog.rev(p1), + self.changelog.rev(p2)))) + else: + self.ui.status(_("(branch merge, don't forget to commit)\n")) + elif failedmerge: + self.ui.status(_("There are unresolved merges with" + " locally modified files.\n")) return err
--- a/tests/test-backout.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-backout.out Tue May 02 18:44:02 2006 +0200 @@ -16,4 +16,6 @@ changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 merging with changeset 2:b66ea5b77abb merging a +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) line 1
--- a/tests/test-backwards-remove.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-backwards-remove.out Tue May 02 18:44:02 2006 +0200 @@ -1,2 +1,3 @@ a +0 files updated, 0 files merged, 1 files removed, 0 files unresolved a
--- a/tests/test-clone-pull-corruption.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-clone-pull-corruption.out Tue May 02 18:44:02 2006 +0200 @@ -1,3 +1,4 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../source abort: pretxncommit hook exited with status 1 transaction abort!
--- a/tests/test-clone-r.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-clone-r.out Tue May 02 18:44:02 2006 +0200 @@ -1,3 +1,5 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +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 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 @@ -27,6 +29,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests @@ -37,6 +40,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests @@ -47,6 +51,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests @@ -57,6 +62,7 @@ adding manifests adding file changes added 4 changesets with 4 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests @@ -67,6 +73,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests @@ -77,6 +84,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests @@ -87,6 +95,7 @@ adding manifests adding file changes added 4 changesets with 5 changes to 2 files +2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests @@ -97,6 +106,7 @@ adding manifests adding file changes added 5 changesets with 6 changes to 3 files +2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests @@ -107,6 +117,7 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests
--- a/tests/test-clone.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-clone.out Tue May 02 18:44:02 2006 +0200 @@ -1,3 +1,4 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved a checking changesets checking manifests @@ -10,4 +11,5 @@ crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions +1 files updated, 0 files merged, 0 files removed, 0 files unresolved a
--- a/tests/test-conflict.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-conflict.out Tue May 02 18:44:02 2006 +0200 @@ -1,6 +1,11 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved merge: warning: conflicts during merge merging a merging a failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +There are unresolved merges, you can redo the full merge using: + hg update -C 2 + hg merge 1 e7fe8eb3e180+0d24b7662d3e+ tip something else =======
--- a/tests/test-confused-revert.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-confused-revert.out Tue May 02 18:44:02 2006 +0200 @@ -6,7 +6,11 @@ forgetting b %%% should show b unknown and a back to normal ? 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 merging a +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) %%% should show foo-b foo-b %%% should show a removed and b added
--- a/tests/test-empty-dir.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-empty-dir.out Tue May 02 18:44:02 2006 +0200 @@ -1,3 +1,4 @@ 321 +0 files updated, 0 files merged, 1 files removed, 0 files unresolved sub/b not present sub not present
--- a/tests/test-encode.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-encode.out Tue May 02 18:44:02 2006 +0200 @@ -4,5 +4,6 @@ this is a test %% uncompress our working dir copy this is a test +1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% uncompress our new working dir copy this is a test
--- a/tests/test-excessive-merge.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-excessive-merge.out Tue May 02 18:44:02 2006 +0200 @@ -1,3 +1,9 @@ +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) +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) changeset: 4:f6c172c6198c tag: tip parent: 1:448a8c5e42f1
--- a/tests/test-filebranch.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-filebranch.out Tue May 02 18:44:02 2006 +0200 @@ -1,4 +1,5 @@ creating base +4 files updated, 0 files merged, 0 files removed, 0 files unresolved creating branch a creating branch b we shouldn't have anything but n state here
--- a/tests/test-flags.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-flags.out Tue May 02 18:44:02 2006 +0200 @@ -5,6 +5,7 @@ adding file changes added 1 changesets with 2 changes to 2 files (run 'hg update' to get a working copy) +2 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../test2 searching for changes adding changesets
--- a/tests/test-hook.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-hook.out Tue May 02 18:44:02 2006 +0200 @@ -3,16 +3,20 @@ 0:29b62aeb769f commit hook: n=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p1=0000000000000000000000000000000000000000 p2= commit hook b +1 files updated, 0 files merged, 0 files removed, 0 files unresolved precommit hook: p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2= pretxncommit hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2= 1:b702efe96888 commit hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2= commit hook b +1 files updated, 0 files merged, 0 files removed, 0 files unresolved precommit hook: p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2= pretxncommit hook: n=1324a5531bac09b329c3845d35ae6a7526874edb p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2= 2:1324a5531bac commit hook: n=1324a5531bac09b329c3845d35ae6a7526874edb p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2= commit hook b +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) precommit hook: p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2 pretxncommit hook: n=4c52fb2e402287dd5dc052090682536c8406c321 p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2 3:4c52fb2e4022
--- a/tests/test-lock-badness.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-lock-badness.out Tue May 02 18:44:02 2006 +0200 @@ -1,4 +1,5 @@ adding a +1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b pushing to ../a abort: could not lock repository ../a: Permission denied
--- a/tests/test-merge-revert.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-merge-revert.out Tue May 02 18:44:02 2006 +0200 @@ -1,19 +1,24 @@ 1:016807e6fdaf 0:eb43f19ff115 016807e6fdaf tip +1 files updated, 0 files merged, 0 files removed, 0 files unresolved eb43f19ff115 eb43f19ff115+ reverting file1 ? file1.orig eb43f19ff115 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip +1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging file1 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip +0 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip
--- a/tests/test-merge-revert2.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-merge-revert2.out Tue May 02 18:44:02 2006 +0200 @@ -1,14 +1,19 @@ 1:f248da0d4c3e 0:9eca13a34789 f248da0d4c3e tip +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 9eca13a34789 9eca13a34789+ reverting file1 9eca13a34789 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved f248da0d4c3e tip +1 files updated, 0 files merged, 0 files removed, 0 files unresolved merge: warning: conflicts during merge merging file1 merging file1 failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +There are unresolved merges with locally modified files. diff -r f248da0d4c3e file1 --- a/file1 +++ b/file1 @@ -25,4 +30,5 @@ reverting file1 f248da0d4c3e tip f248da0d4c3e tip +0 files updated, 0 files merged, 0 files removed, 0 files unresolved f248da0d4c3e tip
--- a/tests/test-merge1.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-merge1.out Tue May 02 18:44:02 2006 +0200 @@ -1,10 +1,17 @@ +0 files updated, 0 files merged, 1 files removed, 0 files unresolved %% no merges expected +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +0 files updated, 0 files merged, 1 files removed, 0 files unresolved %% merge should fail abort: 'b' already exists in the working dir and differs from remote %% merge of b expected merging for b merging b +0 files updated, 1 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 Contents of b should be "this is file b1" This is file b1 %% merge fails @@ -12,8 +19,13 @@ %% merge expected! merging for b merging b +0 files updated, 1 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 %% merge of b should fail abort: outstanding uncommitted changes %% merge of b expected merging for b merging b +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit)
--- a/tests/test-merge2.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-merge2.out Tue May 02 18:44:02 2006 +0200 @@ -1,2 +1,5 @@ +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b +0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b
--- a/tests/test-merge4.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-merge4.out Tue May 02 18:44:02 2006 +0200 @@ -0,0 +1,3 @@ +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)
--- a/tests/test-merge5.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-merge5.out Tue May 02 18:44:02 2006 +0200 @@ -1,3 +1,4 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b this update spans a branch affecting the following files: b
--- a/tests/test-merge6.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-merge6.out Tue May 02 18:44:02 2006 +0200 @@ -1,3 +1,6 @@ +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +2 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../B1 searching for changes adding changesets @@ -5,6 +8,8 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) bar should remain deleted. f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo pulling from ../A2 @@ -14,5 +19,7 @@ adding file changes added 1 changesets with 0 changes to 0 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +(branch merge, don't forget to commit) bar should remain deleted. f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
--- a/tests/test-merge7.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-merge7.out Tue May 02 18:44:02 2006 +0200 @@ -1,3 +1,4 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../test-a searching for changes adding changesets @@ -8,6 +9,10 @@ merge: warning: conflicts during merge merging test.txt merging test.txt failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +There are unresolved merges, you can redo the full merge using: + hg update -C 1 + hg merge 2 pulling from ../test-a searching for changes adding changesets @@ -25,7 +30,9 @@ file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 merging test.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -(branch merge, don't forget to commit) +There are unresolved merges, you can redo the full merge using: + hg update -C 3 + hg merge 4 one <<<<<<< two-point-five
--- a/tests/test-pull-permission.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-pull-permission.out Tue May 02 18:44:02 2006 +0200 @@ -3,6 +3,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests
--- a/tests/test-pull-pull-corruption.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-pull-pull-corruption.out Tue May 02 18:44:02 2006 +0200 @@ -3,6 +3,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../source2 pulling from ../source1 requesting all changes
--- a/tests/test-pull.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-pull.out Tue May 02 18:44:02 2006 +0200 @@ -9,11 +9,13 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions +0 files updated, 0 files merged, 0 files removed, 0 files unresolved foo 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo pulling from http://localhost:20059/
--- a/tests/test-push-hook-lock.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-push-hook-lock.out Tue May 02 18:44:02 2006 +0200 @@ -1,4 +1,6 @@ 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 pushing to ../2 searching for changes adding changesets
--- a/tests/test-push-r.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-push-r.out Tue May 02 18:44:02 2006 +0200 @@ -1,3 +1,5 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +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 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000
--- a/tests/test-push-warn.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-push-warn.out Tue May 02 18:44:02 2006 +0200 @@ -1,3 +1,4 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved pushing to ../a searching for changes abort: unsynced remote changes! @@ -13,6 +14,8 @@ searching for changes abort: push creates new remote branches! (did you forget to merge? use push -f to force) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) pushing to ../a searching for changes adding changesets @@ -20,7 +23,12 @@ adding file changes added 2 changesets with 1 changes to 1 files 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 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging foo +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) pushing to ../c searching for changes abort: push creates new remote branches!
--- a/tests/test-remove.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-remove.out Tue May 02 18:44:02 2006 +0200 @@ -45,3 +45,4 @@ -a +0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-rename.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-rename.out Tue May 02 18:44:02 2006 +0200 @@ -1,21 +1,27 @@ # rename a single file A d2/c R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # rename --after a single file A d2/c R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # move a single file to an existing directory A d2/a1 R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # move --after a single file to an existing directory A d2/a1 R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # rename a file using a relative path A d1/d11/e R d2/b +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # rename --after a file using a relative path A d1/d11/e R d2/b +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # rename directory d1 as d3 copying d1/a to d3/a copying d1/b to d3/b @@ -33,6 +39,7 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # rename --after directory d1 as d3 copying d1/a to d3/a copying d1/b to d3/b @@ -50,21 +57,25 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # move a directory using a relative path copying ../d1/d11/a1 to d3/d11/a1 removing ../d1/d11/a1 A d2/d3/d11/a1 R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # move --after a directory using a relative path copying ../d1/d11/a1 to d3/d11/a1 removing ../d1/d11/a1 A d2/d3/d11/a1 R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # move directory d1/d11 to an existing directory d2 (removes empty d1) copying d1/d11/a1 to d2/d11/a1 removing d1/d11/a1 A d2/d11/a1 R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # move directories d1 and d2 to a new directory d3 copying d1/a to d3/d1/a copying d1/b to d3/d1/b @@ -86,6 +97,7 @@ R d1/ba R d1/d11/a1 R d2/b +5 files updated, 0 files merged, 5 files removed, 0 files unresolved # move --after directories d1 and d2 to a new directory d3 copying d1/a to d3/d1/a copying d1/b to d3/d1/b @@ -107,6 +119,7 @@ R d1/ba R d1/d11/a1 R d2/b +5 files updated, 0 files merged, 5 files removed, 0 files unresolved # move everything under directory d1 to existing directory d2, do not # overwrite existing files (d2/b) d2/b: not overwriting - file exists @@ -122,6 +135,7 @@ < d1/b --- > d2/b +3 files updated, 0 files merged, 3 files removed, 0 files unresolved # attempt to move potentially more than one file into a non-existent # directory abort: with multiple sources, destination must be an existing directory @@ -142,6 +156,7 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # move --after some files under d1 to d2/d21 (glob) copying d1/a to d2/d21/a copying d1/d11/a1 to d2/d21/a1 @@ -151,6 +166,7 @@ A d2/d21/a1 R d1/a R d1/d11/a1 +2 files updated, 0 files merged, 2 files removed, 0 files unresolved # move every file under d1 starting with an 'a' to d2/d21 (regexp) copying d1/a to d2/d21/a copying d1/d11/a1 to d2/d21/a1 @@ -160,15 +176,19 @@ A d2/d21/a1 R d1/a R d1/d11/a1 +2 files updated, 0 files merged, 2 files removed, 0 files unresolved # attempt to overwrite an existing file d1/ca: not overwriting - file exists ? d1/ca +0 files updated, 0 files merged, 0 files removed, 0 files unresolved # forced overwrite of an existing file A d1/ca R d1/ba +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # replace a symlink with a file A d1/ca R d1/ba +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # do not copy more than one source file to the same destination file copying d1/d11/a1 to d3/d11/a1 d3/b: not overwriting - d2/b collides with d1/b @@ -181,6 +201,7 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # move a whole subtree with "hg rename ." copying a to ../d3/d1/a copying b to ../d3/d1/b @@ -198,6 +219,7 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # move a whole subtree with "hg rename --after ." copying a to ../d3/a copying b to ../d3/b @@ -215,6 +237,7 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # move the parent tree with "hg rename .." copying ../a to ../../d3/a copying ../b to ../../d3/b @@ -232,6 +255,7 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # skip removed files copying d1/a to d3/a copying d1/ba to d3/ba @@ -246,14 +270,18 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 3 files removed, 0 files unresolved # transitive rename A d1/bc R d1/b +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # transitive rename --after A d1/bc R d1/b +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b) M d1/b +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # check illegal path components abort: path contains illegal component: .hg/foo @@ -261,12 +289,14 @@ abort: path contains illegal component: .hg/foo ! d1/d11/a1 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved abort: path contains illegal component: .hg/a1 abort: ../a1 not under root abort: path contains illegal component: .hg/a1 ! d1/d11/a1 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved abort: path contains illegal component: .hg/foo abort: ../../../foo not under root
--- a/tests/test-revert.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-revert.out Tue May 02 18:44:02 2006 +0200 @@ -28,7 +28,6 @@ reverting e resolving manifests getting e -1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% should say no changes needed no changes needed to a %% should say file not managed @@ -45,6 +44,7 @@ forgetting a %% should silently add a A a +0 files updated, 0 files merged, 1 files removed, 0 files unresolved reverting c %% should print non-executable non-executable
--- a/tests/test-ro-message.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-ro-message.out Tue May 02 18:44:02 2006 +0200 @@ -1,1 +1,3 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +2 files updated, 0 files merged, 0 files removed, 0 files unresolved abort: Permission denied - test-ro-message/b/vehicle
--- a/tests/test-simple-update.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-simple-update.out Tue May 02 18:44:02 2006 +0200 @@ -4,6 +4,8 @@ crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +0 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../branch searching for changes adding changesets @@ -16,6 +18,7 @@ crosschecking files in changesets and manifests checking files 1 files, 2 changesets, 2 total revisions +1 files updated, 0 files merged, 0 files removed, 0 files unresolved foo bar 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo
--- a/tests/test-ssh.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-ssh.out Tue May 02 18:44:02 2006 +0200 @@ -5,6 +5,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # verify checking changesets checking manifests
--- a/tests/test-static-http.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-static-http.out Tue May 02 18:44:02 2006 +0200 @@ -12,6 +12,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests
--- a/tests/test-tags.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-tags.out Tue May 02 18:44:02 2006 +0200 @@ -1,4 +1,5 @@ unknown +0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0acdaf898367 tip 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first tip 1:8a3ca90d111dc784e6575d373105be12570e8776 @@ -6,10 +7,13 @@ 8a3ca90d111d tip M a 8a3ca90d111d+ tip +0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0acdaf898367+ first 0acdaf8983679e0aac16e811534eb49d7ee1f2b4+ first M a 8216907a933d tip +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) 8216907a933d+8a3ca90d111d+ tip M .hgtags .hgtags:2: ignoring invalid tag
--- a/tests/test-up-local-change.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-up-local-change.out Tue May 02 18:44:02 2006 +0200 @@ -1,4 +1,6 @@ adding a +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff -r 33aaa84a386b a --- a/a +++ b/a @@ -85,6 +87,7 @@ @@ -1,1 +1,1 @@ a2 -a2 +abc +1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding b M a changeset: 1:802f095af299 @@ -143,3 +146,4 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved