Mercurial > public > mercurial-scm > hg-stable

diff tests/test-largefiles.t @ 23517:4f18e80d9c30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: show more useful status information while rebasing Show status messages while rebasing, similar to what graft do: rebasing 12:2647734878ef "fork" (tip) This gives more context for the user when resolving conflicts.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 09 Dec 2014 03:45:26 +0100
parents bbe56e07e07a
children 55c92618fdd4
line wrap: on
line diff
--- a/tests/test-largefiles.t	Sun Dec 07 20:04:45 2014 +0100
+++ b/tests/test-largefiles.t	Tue Dec 09 03:45:26 2014 +0100
@@ -1173,6 +1173,7 @@
   adding file changes
   added 1 changesets with 2 changes to 2 files (+1 heads)
   0 largefiles cached
+  rebasing 8:f574fb32bb45 "modify normal file largefile in repo d"
   Invoking status precommit hook
   M sub/normal4
   M sub2/large6
@@ -1230,6 +1231,7 @@
   added 1 changesets with 2 changes to 2 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg rebase
+  rebasing 8:f574fb32bb45 "modify normal file largefile in repo d"
   Invoking status precommit hook
   M sub/normal4
   M sub2/large6