Mercurial > hg
comparison tests/test-rebase-parameters.t @ 19925:9c78ed396075
rebase: preserve working directory parent (BC)
Prior to this changeset, rebase always left the working directory as a parent of
the last rebased changeset. The is dubious when, before the rebase, the working
directory was not a parent of the tip most rebased changeset.
With this changeset, we move the working directory back to its original parent.
If the original parent was rebased, we use it's successors.
This is a step toward solving issue3813 (rebase loses active bookmark if it's
not on a head)
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Mon, 14 Oct 2013 16:12:29 +0200 |
| parents | 0250047a365e |
| children | aa9385f983fa |
comparison
equal
deleted
inserted
replaced
| 19924:c23c62209cc4 | 19925:9c78ed396075 |
|---|---|
| 195 | 195 |
| 196 $ hg rebase --source 'desc("C")' | 196 $ hg rebase --source 'desc("C")' |
| 197 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) | 197 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) |
| 198 | 198 |
| 199 $ hg tglog | 199 $ hg tglog |
| 200 @ 8: 'D' | 200 o 8: 'D' |
| 201 | | 201 | |
| 202 o 7: 'C' | 202 o 7: 'C' |
| 203 | | 203 | |
| 204 o 6: 'I' | 204 @ 6: 'I' |
| 205 | | 205 | |
| 206 o 5: 'H' | 206 o 5: 'H' |
| 207 | | 207 | |
| 208 | o 4: 'G' | 208 | o 4: 'G' |
| 209 |/| | 209 |/| |
| 255 | 255 |
| 256 $ hg rebase --base 'desc("D")' | 256 $ hg rebase --base 'desc("D")' |
| 257 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) | 257 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) |
| 258 | 258 |
| 259 $ hg tglog | 259 $ hg tglog |
| 260 @ 8: 'D' | 260 o 8: 'D' |
| 261 | | 261 | |
| 262 o 7: 'C' | 262 o 7: 'C' |
| 263 | | 263 | |
| 264 o 6: 'B' | 264 o 6: 'B' |
| 265 | | 265 | |
| 266 o 5: 'I' | 266 @ 5: 'I' |
| 267 | | 267 | |
| 268 o 4: 'H' | 268 o 4: 'H' |
| 269 | | 269 | |
| 270 | o 3: 'G' | 270 | o 3: 'G' |
| 271 |/| | 271 |/| |
| 285 | 285 |
| 286 $ hg rebase --source 2 --dest 7 | 286 $ hg rebase --source 2 --dest 7 |
| 287 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/*-backup.hg (glob) | 287 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/*-backup.hg (glob) |
| 288 | 288 |
| 289 $ hg tglog | 289 $ hg tglog |
| 290 @ 8: 'D' | 290 o 8: 'D' |
| 291 | | 291 | |
| 292 o 7: 'C' | 292 o 7: 'C' |
| 293 | | 293 | |
| 294 | o 6: 'I' | 294 | @ 6: 'I' |
| 295 |/ | 295 |/ |
| 296 o 5: 'H' | 296 o 5: 'H' |
| 297 | | 297 | |
| 298 | o 4: 'G' | 298 | o 4: 'G' |
| 299 |/| | 299 |/| |
| 315 | 315 |
| 316 $ hg rebase --base 3 --dest 7 | 316 $ hg rebase --base 3 --dest 7 |
| 317 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/*-backup.hg (glob) | 317 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/*-backup.hg (glob) |
| 318 | 318 |
| 319 $ hg tglog | 319 $ hg tglog |
| 320 @ 8: 'D' | 320 o 8: 'D' |
| 321 | | 321 | |
| 322 o 7: 'C' | 322 o 7: 'C' |
| 323 | | 323 | |
| 324 o 6: 'B' | 324 o 6: 'B' |
| 325 | | 325 | |
| 326 | o 5: 'I' | 326 | @ 5: 'I' |
| 327 |/ | 327 |/ |
| 328 o 4: 'H' | 328 o 4: 'H' |
| 329 | | 329 | |
| 330 | o 3: 'G' | 330 | o 3: 'G' |
| 331 |/| | 331 |/| |
| 345 | 345 |
| 346 $ hg rebase --rev 'desc("C")::' | 346 $ hg rebase --rev 'desc("C")::' |
| 347 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/*-backup.hg (glob) | 347 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/*-backup.hg (glob) |
| 348 | 348 |
| 349 $ hg tglog | 349 $ hg tglog |
| 350 @ 8: 'D' | 350 o 8: 'D' |
| 351 | | 351 | |
| 352 o 7: 'C' | 352 o 7: 'C' |
| 353 | | 353 | |
| 354 o 6: 'I' | 354 @ 6: 'I' |
| 355 | | 355 | |
| 356 o 5: 'H' | 356 o 5: 'H' |
| 357 | | 357 | |
| 358 | o 4: 'G' | 358 | o 4: 'G' |
| 359 |/| | 359 |/| |