Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 23516:328afbad6e57 | 23517:4f18e80d9c30 |
|---|---|
| 205 $ echo largeX > largeX | 205 $ echo largeX > largeX |
| 206 $ hg add --large largeX | 206 $ hg add --large largeX |
| 207 $ hg commit -m '#4' | 207 $ hg commit -m '#4' |
| 208 | 208 |
| 209 $ hg rebase -s 1 -d 2 --keep | 209 $ hg rebase -s 1 -d 2 --keep |
| 210 rebasing 1:72518492caa6 "#1" | |
| 211 rebasing 4:07d6153b5c04 "#4" (tip) | |
| 210 #if windows | 212 #if windows |
| 211 $ hg status -A large1 | 213 $ hg status -A large1 |
| 212 large1: * (glob) | 214 large1: * (glob) |
| 213 #else | 215 #else |
| 214 $ hg status -A large1 | 216 $ hg status -A large1 |
| 493 $ cat large1 | 495 $ cat large1 |
| 494 large1 in #3 | 496 large1 in #3 |
| 495 $ hg rebase -s 1 -d 3 --keep --config ui.interactive=True <<EOF | 497 $ hg rebase -s 1 -d 3 --keep --config ui.interactive=True <<EOF |
| 496 > o | 498 > o |
| 497 > EOF | 499 > EOF |
| 500 rebasing 1:72518492caa6 "#1" | |
| 498 largefile large1 has a merge conflict | 501 largefile large1 has a merge conflict |
| 499 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 | 502 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
| 500 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or | 503 keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or |
| 501 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o | 504 take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o |
| 502 merging normal1 | 505 merging normal1 |
| 516 $ hg resolve -m normal1 | 519 $ hg resolve -m normal1 |
| 517 (no more unresolved files) | 520 (no more unresolved files) |
| 518 $ hg rebase --continue --config ui.interactive=True <<EOF | 521 $ hg rebase --continue --config ui.interactive=True <<EOF |
| 519 > c | 522 > c |
| 520 > EOF | 523 > EOF |
| 524 rebasing 1:72518492caa6 "#1" | |
| 525 rebasing 4:07d6153b5c04 "#4" | |
| 521 local changed .hglf/large1 which remote deleted | 526 local changed .hglf/large1 which remote deleted |
| 522 use (c)hanged version or (d)elete? c | 527 use (c)hanged version or (d)elete? c |
| 523 | 528 |
| 524 $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' | 529 $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
| 525 -e5bb990443d6a92aaf7223813720f7566c9dd05b | 530 -e5bb990443d6a92aaf7223813720f7566c9dd05b |