Mercurial > hg
comparison tests/test-rebase-obsolete.t @ 23505:bd5dbb8a05c8
graft: show more useful status information while grafting
Show status messages with first line of commit description and names, like
grafting 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:38:23 +0100 |
| parents | fab9dda0f2a3 |
| children | 4f18e80d9c30 |
comparison
equal
deleted
inserted
replaced
| 23504:e172a1f2b5bb | 23505:bd5dbb8a05c8 |
|---|---|
| 116 | 116 |
| 117 We make a copy of both the first changeset in the rebased and some other in the | 117 We make a copy of both the first changeset in the rebased and some other in the |
| 118 set. | 118 set. |
| 119 | 119 |
| 120 $ hg graft 42ccdea3bb16 32af7686d403 | 120 $ hg graft 42ccdea3bb16 32af7686d403 |
| 121 grafting revision 1 | 121 grafting 1:42ccdea3bb16 "B" |
| 122 grafting revision 3 | 122 grafting 3:32af7686d403 "D" |
| 123 $ hg rebase -s 42ccdea3bb16 -d . | 123 $ hg rebase -s 42ccdea3bb16 -d . |
| 124 $ hg log -G | 124 $ hg log -G |
| 125 o 10:5ae4c968c6ac C | 125 o 10:5ae4c968c6ac C |
| 126 | | 126 | |
| 127 @ 9:08483444fef9 D | 127 @ 9:08483444fef9 D |