Mercurial > hg-stable
comparison tests/test-bookmarks-rebase.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 | 328afbad6e57 |
| children | aa4a1672583e |
comparison
equal
deleted
inserted
replaced
| 23516:328afbad6e57 | 23517:4f18e80d9c30 |
|---|---|
| 35 * two 3:2ae46b1d99a7 | 35 * two 3:2ae46b1d99a7 |
| 36 | 36 |
| 37 rebase | 37 rebase |
| 38 | 38 |
| 39 $ hg rebase -s two -d one | 39 $ hg rebase -s two -d one |
| 40 rebasing 3:2ae46b1d99a7 "3" (tip two) | |
| 40 saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-backup.hg (glob) | 41 saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-backup.hg (glob) |
| 41 | 42 |
| 42 $ hg log | 43 $ hg log |
| 43 changeset: 3:42e5ed2cdcf4 | 44 changeset: 3:42e5ed2cdcf4 |
| 44 bookmark: two | 45 bookmark: two |