diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py index 4ab66de46a964209bb37fbe0962b828f8a0feac9_bWVyY3VyaWFsL2xvY2FscmVwby5weQ==..a387b0390082b3afbc436e6882378a996e77cd00_bWVyY3VyaWFsL2xvY2FscmVwby5weQ== 100644 --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1432,6 +1432,7 @@ changed = [] removed = list(ctx.removed()) linkrev = len(self) + self.ui.note(_("committing files:\n")) for f in sorted(ctx.modified() + ctx.added()): self.ui.note(f + "\n") try: @@ -1453,6 +1454,7 @@ raise # update manifest + self.ui.note(_("committing manifest\n")) removed = [f for f in sorted(removed) if f in m1 or f in m2] drop = [f for f in removed if f in m] for f in drop: @@ -1466,6 +1468,7 @@ files = [] # update changelog + self.ui.note(_("committing changelog\n")) self.changelog.delayupdate(tr) n = self.changelog.add(mn, files, ctx.description(), trp, p1.node(), p2.node(), diff --git a/tests/test-addremove.t b/tests/test-addremove.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1hZGRyZW1vdmUudA==..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1hZGRyZW1vdmUudA== 100644 --- a/tests/test-addremove.t +++ b/tests/test-addremove.t @@ -6,5 +6,6 @@ adding dir/bar adding foo $ hg -v commit -m "add 1" + committing files: dir/bar foo @@ -9,5 +10,7 @@ dir/bar foo + committing manifest + committing changelog committed changeset 0:6f7f953567a2 $ cd dir/ $ touch ../foo_2 bar_2 @@ -15,5 +18,6 @@ adding dir/bar_2 adding foo_2 $ hg -v commit -m "add 2" + committing files: dir/bar_2 foo_2 @@ -18,5 +22,7 @@ dir/bar_2 foo_2 + committing manifest + committing changelog committed changeset 1:e65414bf35c5 $ cd .. $ hg forget foo diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1jb21taXQtYW1lbmQudA==..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1jb21taXQtYW1lbmQudA== 100644 --- a/tests/test-commit-amend.t +++ b/tests/test-commit-amend.t @@ -106,4 +106,5 @@ $ hg ci -v --amend -m 'no changes, new message' amending changeset 74609c7f506e copying changeset 74609c7f506e to ad120869acf0 + committing files: a @@ -109,4 +110,6 @@ a + committing manifest + committing changelog stripping amended changeset 74609c7f506e 1 changesets found uncompressed size of bundle content: @@ -190,4 +193,5 @@ $ hg commit --amend -v -m "message given from command line" amending changeset 5f357c7560ab copying changeset 5f357c7560ab to ad120869acf0 + committing files: a @@ -193,4 +197,6 @@ a + committing manifest + committing changelog running hook pretxncommit.test-saving-last-message: false transaction abort! rollback completed @@ -212,4 +218,5 @@ HG: user: foo HG: branch 'default' HG: changed a + committing files: a @@ -215,4 +222,6 @@ a + committing manifest + committing changelog running hook pretxncommit.test-saving-last-message: false transaction abort! rollback completed @@ -241,4 +250,5 @@ HG: user: foo HG: branch 'default' HG: changed a + committing files: a @@ -244,4 +254,6 @@ a + committing manifest + committing changelog stripping amended changeset 5f357c7560ab 1 changesets found uncompressed size of bundle content: @@ -266,4 +278,5 @@ $ echo a >> a $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v amending changeset 7ab3bf440b54 + committing files: a @@ -269,4 +282,6 @@ a + committing manifest + committing changelog copying changeset a0ea9b1a4c8c to ad120869acf0 another precious commit message @@ -277,4 +292,5 @@ HG: user: foo HG: branch 'default' HG: changed a + committing files: a @@ -280,4 +296,6 @@ a + committing manifest + committing changelog stripping intermediate changeset a0ea9b1a4c8c stripping amended changeset 7ab3bf440b54 2 changesets found diff --git a/tests/test-commit.t b/tests/test-commit.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1jb21taXQudA==..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1jb21taXQudA== 100644 --- a/tests/test-commit.t +++ b/tests/test-commit.t @@ -50,4 +50,5 @@ $ hg add adding dir/file (glob) $ hg -v commit -m commit-9 dir + committing files: dir/file @@ -53,4 +54,6 @@ dir/file + committing manifest + committing changelog committed changeset 2:d2a76177cb42 $ echo > dir.file @@ -71,4 +74,5 @@ abort: dir2: no match under directory! [255] $ hg -v commit -m commit-13 ../dir + committing files: dir/file @@ -74,4 +78,6 @@ dir/file + committing manifest + committing changelog committed changeset 3:1cd62a2d8db5 $ cd .. @@ -92,4 +98,5 @@ [255] $ echo >> dir/file $ hg -v commit -m commit-17 dir/file + committing files: dir/file @@ -95,4 +102,6 @@ dir/file + committing manifest + committing changelog committed changeset 4:49176991390e An empty date was interpreted as epoch origin diff --git a/tests/test-convert-svn-encoding.t b/tests/test-convert-svn-encoding.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1jb252ZXJ0LXN2bi1lbmNvZGluZy50..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1jb252ZXJ0LXN2bi1lbmNvZGluZy50 100644 --- a/tests/test-convert-svn-encoding.t +++ b/tests/test-convert-svn-encoding.t @@ -52,6 +52,7 @@ 5 init projA source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@1 converting: 0/6 revisions (0.00%) + committing changelog 4 hello source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2 converting: 1/6 revisions (16.67%) @@ -59,7 +60,8 @@ scanning paths: /trunk/\xc3\xa0 0/3 (0.00%) (esc) scanning paths: /trunk/\xc3\xa0/e\xcc\x81 1/3 (33.33%) (esc) scanning paths: /trunk/\xc3\xa9 2/3 (66.67%) (esc) + committing files: \xc3\xa0/e\xcc\x81 (esc) getting files: \xc3\xa0/e\xcc\x81 1/2 (50.00%) (esc) \xc3\xa9 (esc) getting files: \xc3\xa9 2/2 (100.00%) (esc) @@ -62,7 +64,9 @@ \xc3\xa0/e\xcc\x81 (esc) getting files: \xc3\xa0/e\xcc\x81 1/2 (50.00%) (esc) \xc3\xa9 (esc) getting files: \xc3\xa9 2/2 (100.00%) (esc) + committing manifest + committing changelog 3 copy files source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@3 converting: 2/6 revisions (33.33%) @@ -80,9 +84,10 @@ mark /trunk/\xc3\xb9 came from \xc3\xa0:2 (esc) getting files: \xc3\xa0/e\xcc\x81 1/4 (25.00%) (esc) getting files: \xc3\xa9 2/4 (50.00%) (esc) + committing files: \xc3\xa8 (esc) getting files: \xc3\xa8 3/4 (75.00%) (esc) \xc3\xa8: copy \xc3\xa9:6b67ccefd5ce6de77e7ead4f5292843a0255329f (esc) \xc3\xb9/e\xcc\x81 (esc) getting files: \xc3\xb9/e\xcc\x81 4/4 (100.00%) (esc) \xc3\xb9/e\xcc\x81: copy \xc3\xa0/e\xcc\x81:a9092a3d84a37b9993b5c73576f6de29b7ea50f6 (esc) @@ -83,9 +88,11 @@ \xc3\xa8 (esc) getting files: \xc3\xa8 3/4 (75.00%) (esc) \xc3\xa8: copy \xc3\xa9:6b67ccefd5ce6de77e7ead4f5292843a0255329f (esc) \xc3\xb9/e\xcc\x81 (esc) getting files: \xc3\xb9/e\xcc\x81 4/4 (100.00%) (esc) \xc3\xb9/e\xcc\x81: copy \xc3\xa0/e\xcc\x81:a9092a3d84a37b9993b5c73576f6de29b7ea50f6 (esc) + committing manifest + committing changelog 2 remove files source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@4 converting: 3/6 revisions (50.00%) @@ -99,8 +106,11 @@ reparent to file://*/svn-repo/trunk (glob) getting files: \xc3\xa8 1/2 (50.00%) (esc) getting files: \xc3\xb9/e\xcc\x81 2/2 (100.00%) (esc) + committing files: + committing manifest + committing changelog 1 branch to branch? source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5 converting: 4/6 revisions (66.67%) reparent to file://*/svn-repo/branches/branch%C3%A9 (glob) scanning paths: /branches/branch\xc3\xa9 0/1 (0.00%) (esc) @@ -102,10 +112,11 @@ 1 branch to branch? source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5 converting: 4/6 revisions (66.67%) reparent to file://*/svn-repo/branches/branch%C3%A9 (glob) scanning paths: /branches/branch\xc3\xa9 0/1 (0.00%) (esc) + committing changelog 0 branch to branch?e source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6 converting: 5/6 revisions (83.33%) reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) scanning paths: /branches/branch\xc3\xa9e 0/1 (0.00%) (esc) @@ -107,10 +118,11 @@ 0 branch to branch?e source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6 converting: 5/6 revisions (83.33%) reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) scanning paths: /branches/branch\xc3\xa9e 0/1 (0.00%) (esc) + committing changelog reparent to file://*/svn-repo (glob) reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) reparent to file://*/svn-repo (glob) reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) updating tags @@ -112,6 +124,7 @@ reparent to file://*/svn-repo (glob) reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) reparent to file://*/svn-repo (glob) reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) updating tags + committing files: .hgtags @@ -117,4 +130,6 @@ .hgtags + committing manifest + committing changelog run hg sink post-conversion action $ cd A-hg $ hg up diff --git a/tests/test-copy.t b/tests/test-copy.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1jb3B5LnQ=..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1jb3B5LnQ= 100644 --- a/tests/test-copy.t +++ b/tests/test-copy.t @@ -20,5 +20,6 @@ commit: 1 copied update: (current) $ hg --debug commit -m "2" + committing files: b b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 @@ -23,5 +24,7 @@ b b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 + committing manifest + committing changelog committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4 we should see two history entries diff --git a/tests/test-graft.t b/tests/test-graft.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1ncmFmdC50..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1ncmFmdC50 100644 --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -159,4 +159,5 @@ merging b and a to b my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 premerge successful + committing files: b @@ -162,4 +163,6 @@ b + committing manifest + committing changelog grafting 5:97f8bfe72746 "5" searching for copies back to rev 1 resolving manifests @@ -169,4 +172,5 @@ getting e updating: e 1/1 files (100.00%) b: remote unchanged -> k + committing files: e @@ -172,4 +176,6 @@ e + committing manifest + committing changelog grafting 4:9c233e8e184d "4" searching for copies back to rev 1 resolving manifests diff --git a/tests/test-hook.t b/tests/test-hook.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1ob29rLnQ=..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1ob29rLnQ= 100644 --- a/tests/test-hook.t +++ b/tests/test-hook.t @@ -511,4 +511,5 @@ Automatically installed hook $ echo >> foo $ hg ci --debug -d '0 0' -m 'change foo' + committing files: foo @@ -514,4 +515,6 @@ foo + committing manifest + committing changelog calling hook commit.auto: hgext_hookext.autohook Automatically installed hook committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708 diff --git a/tests/test-import.t b/tests/test-import.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1pbXBvcnQudA==..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1pbXBvcnQudA== 100644 --- a/tests/test-import.t +++ b/tests/test-import.t @@ -411,4 +411,5 @@ $ hg --cwd b import -v ../patch1 ../patch2 applying ../patch1 patching file a + committing files: a @@ -414,4 +415,6 @@ a + committing manifest + committing changelog created 1d4bd90af0e4 applying ../patch2 patching file a @@ -415,4 +418,5 @@ created 1d4bd90af0e4 applying ../patch2 patching file a + committing files: a @@ -418,4 +422,6 @@ a + committing manifest + committing changelog created 6d019af21222 $ hg --cwd b rollback repository tip rolled back to revision 0 (undo import) diff --git a/tests/test-issue1175.t b/tests/test-issue1175.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1pc3N1ZTExNzUudA==..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1pc3N1ZTExNzUudA== 100644 --- a/tests/test-issue1175.t +++ b/tests/test-issue1175.t @@ -28,6 +28,7 @@ $ hg ci -Am4 a $ hg ci --debug --traceback -Am5 b + committing files: b b: searching for copy revision for a b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db @@ -31,6 +32,8 @@ b b: searching for copy revision for a b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db + committing manifest + committing changelog committed changeset 5:732aafbecb501a198b3cc9323ad3899ff04ccf95 $ hg verify diff --git a/tests/test-keyword.t b/tests/test-keyword.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1rZXl3b3JkLnQ=..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1rZXl3b3JkLnQ= 100644 --- a/tests/test-keyword.t +++ b/tests/test-keyword.t @@ -135,5 +135,6 @@ Commit with several checks $ hg --debug commit -mabsym -u 'User Name <user@example.com>' + committing files: a b @@ -138,5 +139,7 @@ a b + committing manifest + committing changelog overwriting a expanding keywords running hook commit.test: cp a hooktest committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 @@ -475,4 +478,5 @@ new file mode 100644 examine changes to 'r'? [Ynesfdaq?] y + committing files: r @@ -478,4 +482,6 @@ r + committing manifest + committing changelog committed changeset 3:82a2f715724d overwriting r expanding keywords - status call required for dirstate.normallookup() check @@ -500,4 +506,5 @@ new file mode 100644 examine changes to 'i'? [Ynesfdaq?] y + committing files: i @@ -503,4 +510,6 @@ i + committing manifest + committing changelog committed changeset 3:9f40ceb5a072 $ cat i $Id$ @@ -585,5 +594,6 @@ Commit and show expansion in original and copy $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' + committing files: c c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 @@ -588,5 +598,7 @@ c c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 + committing manifest + committing changelog overwriting c expanding keywords committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d $ cat a c @@ -756,4 +768,5 @@ Commit with multi-line message and custom expansion $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' + committing files: a @@ -759,4 +772,6 @@ a + committing manifest + committing changelog overwriting a expanding keywords committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 $ rm log @@ -798,6 +813,9 @@ $ hg debugrebuildstate $ hg remove a $ hg --debug commit -m rma + committing files: + committing manifest + committing changelog committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 $ hg status ? c @@ -868,4 +886,5 @@ >>> text = re.sub(r'(Id.*)', r'\1 rejecttest', open('a').read()) >>> open('a', 'wb').write(text) $ hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>' + committing files: a @@ -871,4 +890,6 @@ a + committing manifest + committing changelog overwriting a expanding keywords committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 $ hg export -o ../rejecttest.diff tip @@ -908,5 +929,6 @@ [255] $ cd x $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' + committing files: x/a x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e @@ -911,5 +933,7 @@ x/a x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e + committing manifest + committing changelog overwriting x/a expanding keywords committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 $ cat a diff --git a/tests/test-mq-guards.t b/tests/test-mq-guards.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1tcS1ndWFyZHMudA==..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1tcS1ndWFyZHMudA== 100644 --- a/tests/test-mq-guards.t +++ b/tests/test-mq-guards.t @@ -270,4 +270,5 @@ applying c.patch patching file c adding c + committing files: c @@ -273,4 +274,6 @@ c + committing manifest + committing changelog now at: c.patch guards in series file: +1 +2 -3 diff --git a/tests/test-mq-qpush-fail.t b/tests/test-mq-qpush-fail.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1tcS1xcHVzaC1mYWlsLnQ=..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1tcS1xcHVzaC1mYWlsLnQ= 100644 --- a/tests/test-mq-qpush-fail.t +++ b/tests/test-mq-qpush-fail.t @@ -264,4 +264,5 @@ applying p2 saving current version of a as a.orig patching file a + committing files: a @@ -267,4 +268,6 @@ a + committing manifest + committing changelog applying p3 saving current version of b as b.orig saving current version of d as d.orig @@ -277,4 +280,5 @@ file e already exists 1 out of 1 hunks FAILED -- saving rejects to file e.rej patch failed to apply + committing files: b @@ -280,4 +284,6 @@ b + committing manifest + committing changelog patch failed, rejects left in working dir errors during apply, please fix and refresh p3 [2] @@ -302,4 +308,5 @@ $ hg qpush --force --no-backup --verbose applying p2 patching file a + committing files: a @@ -305,4 +312,6 @@ a + committing manifest + committing changelog now at: p2 $ test -f a.orig && echo 'error: backup with --no-backup' [1] @@ -316,4 +325,5 @@ $ hg qgoto --force --no-backup p2 --verbose applying p2 patching file a + committing files: a @@ -319,4 +329,6 @@ a + committing manifest + committing changelog now at: p2 $ test -f a.orig && echo 'error: backup with --no-backup' [1] diff --git a/tests/test-mq-symlinks.t b/tests/test-mq-symlinks.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1tcS1zeW1saW5rcy50..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1tcS1zeW1saW5rcy50 100644 --- a/tests/test-mq-symlinks.t +++ b/tests/test-mq-symlinks.t @@ -47,4 +47,5 @@ $ hg qpush --debug applying updatelink patching file a + committing files: a @@ -50,4 +51,6 @@ a + committing manifest + committing changelog now at: updatelink $ "$TESTDIR/readlink.py" a a -> c diff --git a/tests/test-mq.t b/tests/test-mq.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1tcS50..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1tcS50 100644 --- a/tests/test-mq.t +++ b/tests/test-mq.t @@ -1400,4 +1400,5 @@ applying empty saving current version of hello.txt as hello.txt.orig patching file hello.txt + committing files: hello.txt @@ -1403,4 +1404,6 @@ hello.txt + committing manifest + committing changelog now at: empty $ hg st M bye.txt diff --git a/tests/test-patch-offset.t b/tests/test-patch-offset.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1wYXRjaC1vZmZzZXQudA==..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1wYXRjaC1vZmZzZXQudA== 100644 --- a/tests/test-patch-offset.t +++ b/tests/test-patch-offset.t @@ -68,4 +68,5 @@ Hunk #1 succeeded at 43 (offset 34 lines). Hunk #2 succeeded at 87 (offset 34 lines). Hunk #3 succeeded at 109 (offset 34 lines). + committing files: a @@ -71,4 +72,6 @@ a + committing manifest + committing changelog created 189885cecb41 compare imported changes against reference file diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1yZWJhc2UtY29uZmxpY3RzLnQ=..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1yZWJhc2UtY29uZmxpY3RzLnQ= 100644 --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -245,4 +245,5 @@ f1.txt: remote is newer -> g getting f1.txt updating: f1.txt 1/1 files (100.00%) + committing files: f1.txt @@ -248,4 +249,6 @@ f1.txt + committing manifest + committing changelog rebased as 19c888675e13 rebasing 10:2f2496ddf49d "merge" (tip) rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%) @@ -261,4 +264,5 @@ f1.txt: remote is newer -> g getting f1.txt updating: f1.txt 1/1 files (100.00%) + committing files: f1.txt @@ -264,4 +268,6 @@ f1.txt + committing manifest + committing changelog rebased as 2a7f09cac94c rebase merging completed update back to initial working directory parent diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1yZWJhc2UtbXEtc2tpcC50..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1yZWJhc2UtbXEtc2tpcC50 100644 --- a/tests/test-rebase-mq-skip.t +++ b/tests/test-rebase-mq-skip.t @@ -56,4 +56,5 @@ getting r1 resolving manifests getting p0 + committing files: p0 @@ -59,4 +60,6 @@ p0 + committing manifest + committing changelog rebasing 3:148775c71080 "P1" (p1.patch qtip) resolving manifests note: rebase of 3:148775c71080 created no changes to commit diff --git a/tests/test-rebase-newancestor.t b/tests/test-rebase-newancestor.t index 4ab66de46a964209bb37fbe0962b828f8a0feac9_dGVzdHMvdGVzdC1yZWJhc2UtbmV3YW5jZXN0b3IudA==..a387b0390082b3afbc436e6882378a996e77cd00_dGVzdHMvdGVzdC1yZWJhc2UtbmV3YW5jZXN0b3IudA== 100644 --- a/tests/test-rebase-newancestor.t +++ b/tests/test-rebase-newancestor.t @@ -291,4 +291,5 @@ end of auction getting other + committing files: other @@ -294,4 +295,6 @@ other + committing manifest + committing changelog rebase merging completed 1 changesets found uncompressed size of bundle content: