Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-conflicts.t @ 23749:a387b0390082

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: show headline notes in commitctx before showing filenames commitctx already showed notes with filenames but didn't provide any context. It is just as relevant to know when manifest or changelog is committed. So, in addition to filenames, also show headlines 'committing files:', 'committing manifest' and 'committing changelog'.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 18 Apr 2014 13:33:20 +0200
parents e7fcf58acd71
children aa4a1672583e
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Fri Aug 15 19:43:32 2014 +0200
+++ b/tests/test-rebase-conflicts.t	Fri Apr 18 13:33:20 2014 +0200
@@ -245,7 +245,10 @@
    f1.txt: remote is newer -> g
   getting f1.txt
   updating: f1.txt 1/1 files (100.00%)
+  committing files:
   f1.txt
+  committing manifest
+  committing changelog
   rebased as 19c888675e13
   rebasing 10:2f2496ddf49d "merge" (tip)
   rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%)
@@ -261,7 +264,10 @@
    f1.txt: remote is newer -> g
   getting f1.txt
   updating: f1.txt 1/1 files (100.00%)
+  committing files:
   f1.txt
+  committing manifest
+  committing changelog
   rebased as 2a7f09cac94c
   rebase merging completed
   update back to initial working directory parent