Mercurial > public > mercurial-scm > hg
diff tests/test-largefiles-update.t @ 23517:4f18e80d9c30
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 | b5e2128ce9e6 |
| children | 495bc1b65d25 |
line wrap: on
line diff
--- a/tests/test-largefiles-update.t Sun Dec 07 20:04:45 2014 +0100 +++ b/tests/test-largefiles-update.t Tue Dec 09 03:45:26 2014 +0100 @@ -207,6 +207,8 @@ $ hg commit -m '#4' $ hg rebase -s 1 -d 2 --keep + rebasing 1:72518492caa6 "#1" + rebasing 4:07d6153b5c04 "#4" (tip) #if windows $ hg status -A large1 large1: * (glob) @@ -495,6 +497,7 @@ $ hg rebase -s 1 -d 3 --keep --config ui.interactive=True <<EOF > o > EOF + rebasing 1:72518492caa6 "#1" largefile large1 has a merge conflict ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or @@ -518,6 +521,8 @@ $ hg rebase --continue --config ui.interactive=True <<EOF > c > EOF + rebasing 1:72518492caa6 "#1" + rebasing 4:07d6153b5c04 "#4" local changed .hglf/large1 which remote deleted use (c)hanged version or (d)elete? c