Mercurial > hg
comparison tests/test-rebase-newancestor.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 | 2fb0504b8175 |
comparison
equal
deleted
inserted
replaced
| 23516:328afbad6e57 | 23517:4f18e80d9c30 |
|---|---|
| 36 | o 1: 'B' | 36 | o 1: 'B' |
| 37 |/ | 37 |/ |
| 38 o 0: 'A' | 38 o 0: 'A' |
| 39 | 39 |
| 40 $ hg rebase -s 1 -d 3 | 40 $ hg rebase -s 1 -d 3 |
| 41 rebasing 1:0f4f7cb4f549 "B" | |
| 41 merging a | 42 merging a |
| 43 rebasing 2:30ae917c0e4f "C" | |
| 42 merging a | 44 merging a |
| 43 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-backup.hg (glob) | 45 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-backup.hg (glob) |
| 44 | 46 |
| 45 $ hg tglog | 47 $ hg tglog |
| 46 o 3: 'C' | 48 o 3: 'C' |
| 123 $ hg clone -qU . ../ancestor-merge-2 | 125 $ hg clone -qU . ../ancestor-merge-2 |
| 124 | 126 |
| 125 Full rebase all the way back from branching point: | 127 Full rebase all the way back from branching point: |
| 126 | 128 |
| 127 $ hg rebase -r 'only(dev,default)' -d default | 129 $ hg rebase -r 'only(dev,default)' -d default |
| 130 rebasing 1:1d1a643d390e "dev: create branch" | |
| 131 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" | |
| 132 rebasing 4:4b019212aaf6 "dev: merge default" | |
| 128 remote changed f-default which local deleted | 133 remote changed f-default which local deleted |
| 129 use (c)hanged version or leave (d)eleted? c | 134 use (c)hanged version or leave (d)eleted? c |
| 135 rebasing 6:9455ee510502 "dev: merge default" | |
| 130 saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-backup.hg (glob) | 136 saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-backup.hg (glob) |
| 131 $ hg tglog | 137 $ hg tglog |
| 132 o 6: 'dev: merge default' | 138 o 6: 'dev: merge default' |
| 133 | | 139 | |
| 134 o 5: 'dev: merge default' | 140 o 5: 'dev: merge default' |
| 147 | 153 |
| 148 $ cd ../ancestor-merge-2 | 154 $ cd ../ancestor-merge-2 |
| 149 | 155 |
| 150 $ hg phase -fdr0: | 156 $ hg phase -fdr0: |
| 151 $ hg rebase -r 'children(only(dev,default))' -d default | 157 $ hg rebase -r 'children(only(dev,default))' -d default |
| 158 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" | |
| 159 rebasing 4:4b019212aaf6 "dev: merge default" | |
| 152 remote changed f-default which local deleted | 160 remote changed f-default which local deleted |
| 153 use (c)hanged version or leave (d)eleted? c | 161 use (c)hanged version or leave (d)eleted? c |
| 162 rebasing 6:9455ee510502 "dev: merge default" | |
| 154 saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-backup.hg (glob) | 163 saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-backup.hg (glob) |
| 155 $ hg tglog | 164 $ hg tglog |
| 156 o 7: 'dev: merge default' | 165 o 7: 'dev: merge default' |
| 157 | | 166 | |
| 158 o 6: 'dev: merge default' | 167 o 6: 'dev: merge default' |
| 220 o | 1: 'change' | 229 o | 1: 'change' |
| 221 |/ | 230 |/ |
| 222 o 0: 'common' | 231 o 0: 'common' |
| 223 | 232 |
| 224 $ hg rebase -r 4 -d 2 | 233 $ hg rebase -r 4 -d 2 |
| 234 rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor" | |
| 225 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-backup.hg (glob) | 235 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-backup.hg (glob) |
| 226 $ hg tip | 236 $ hg tip |
| 227 changeset: 5:cca50676b1c5 | 237 changeset: 5:cca50676b1c5 |
| 228 tag: tip | 238 tag: tip |
| 229 parent: 2:a60552eb93fb | 239 parent: 2:a60552eb93fb |
| 231 user: test | 241 user: test |
| 232 date: Thu Jan 01 00:00:00 1970 +0000 | 242 date: Thu Jan 01 00:00:00 1970 +0000 |
| 233 summary: merge p1 3=outside p2 1=ancestor | 243 summary: merge p1 3=outside p2 1=ancestor |
| 234 | 244 |
| 235 $ hg rebase -r 4 -d 2 | 245 $ hg rebase -r 4 -d 2 |
| 246 rebasing 4:a57575f79074 "merge p1 1=ancestor p2 3=outside" | |
| 236 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-backup.hg (glob) | 247 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-backup.hg (glob) |
| 237 $ hg tip | 248 $ hg tip |
| 238 changeset: 5:f9daf77ffe76 | 249 changeset: 5:f9daf77ffe76 |
| 239 tag: tip | 250 tag: tip |
| 240 parent: 2:a60552eb93fb | 251 parent: 2:a60552eb93fb |
| 261 $ hg up -qr 2 | 272 $ hg up -qr 2 |
| 262 $ hg merge -qr 3 | 273 $ hg merge -qr 3 |
| 263 $ echo 'other change while merging future "rebase ancestors"' > other | 274 $ echo 'other change while merging future "rebase ancestors"' > other |
| 264 $ hg ci -Aqm 'merge rebase ancestors' | 275 $ hg ci -Aqm 'merge rebase ancestors' |
| 265 $ hg rebase -d 5 -v | 276 $ hg rebase -d 5 -v |
| 277 rebasing 6:4c5f12f25ebe "merge rebase ancestors" (tip) | |
| 266 resolving manifests | 278 resolving manifests |
| 267 removing other | 279 removing other |
| 268 note: merging f9daf77ffe76+ and 4c5f12f25ebe using bids from ancestors a60552eb93fb and f59da8fc0fcf | 280 note: merging f9daf77ffe76+ and 4c5f12f25ebe using bids from ancestors a60552eb93fb and f59da8fc0fcf |
| 269 | 281 |
| 270 calculating bids for ancestor a60552eb93fb | 282 calculating bids for ancestor a60552eb93fb |