1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531
|
$ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase=
>
> [phases]
> publish=False
>
> [alias]
> tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
> EOF
$ hg init a
$ cd a
$ hg unbundle "$TESTDIR/bundles/rebase.hg"
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
new changesets cd010b8cd998:02de42196ebe (8 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo I > I
$ hg ci -AmI
adding I
$ hg tglog
@ 8: e7ec4e813ba6 'I'
|
o 7: 02de42196ebe 'H'
|
| o 6: eea13746799a 'G'
|/|
o | 5: 24b6387c8c8c 'F'
| |
| o 4: 9520eea781bc 'E'
|/
| o 3: 32af7686d403 'D'
| |
| o 2: 5fddd98957c8 'C'
| |
| o 1: 42ccdea3bb16 'B'
|/
o 0: cd010b8cd998 'A'
$ cd ..
Version with only two heads (to allow default destination to work)
$ hg clone -q -u . a a2heads -r 3 -r 8
These fail:
$ hg clone -q -u . a a0
$ cd a0
$ hg rebase -s 8 -d 7
nothing to rebase
[1]
$ hg rebase --continue --abort
abort: cannot specify both --abort and --continue
[255]
$ hg rebase --continue --collapse
abort: cannot use collapse with continue or abort
[255]
$ hg rebase --continue --dest 4
abort: cannot specify both --continue and --dest
[255]
$ hg rebase --base 5 --source 4
abort: cannot specify both --source and --base
[255]
$ hg rebase --rev 5 --source 4
abort: cannot specify both --rev and --source
[255]
$ hg rebase --base 5 --rev 4
abort: cannot specify both --rev and --base
[255]
$ hg rebase --base 6
abort: branch 'default' has 3 heads - please rebase to an explicit rev
(run 'hg heads .' to see heads, specify destination with -d)
[255]
$ hg rebase --rev '1 & !1' --dest 8
empty "rev" revision set - nothing to rebase
[1]
$ hg rebase --rev 'wdir()' --dest 6
abort: cannot rebase the working copy
[255]
$ hg rebase --source 'wdir()' --dest 6
abort: cannot rebase the working copy
[255]
$ hg rebase --source 1 --source 'wdir()' --dest 6
abort: cannot rebase the working copy
[255]
$ hg rebase --source '1 & !1' --dest 8
empty "source" revision set - nothing to rebase
[1]
$ hg rebase --base '1 & !1' --dest 8
empty "base" revision set - can't compute rebase set
[1]
$ hg rebase --dest 8
nothing to rebase - working directory parent is also destination
[1]
$ hg rebase -b . --dest 8
nothing to rebase - e7ec4e813ba6 is both "base" and destination
[1]
$ hg up -q 7
$ hg rebase --dest 8 --traceback
nothing to rebase - working directory parent is already an ancestor of destination e7ec4e813ba6
[1]
$ hg rebase --dest 8 -b.
nothing to rebase - "base" 02de42196ebe is already an ancestor of destination e7ec4e813ba6
[1]
$ hg rebase --dest '1 & !1'
abort: empty revision set
[255]
These work:
Rebase with no arguments (from 3 onto 8):
$ cd ..
$ hg clone -q -u . a2heads a1
$ cd a1
$ hg up -q -C 3
$ hg rebase
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
@ 6: ed65089c18f8 'D'
|
o 5: 7621bf1a2f17 'C'
|
o 4: 9430a62369c6 'B'
|
o 3: e7ec4e813ba6 'I'
|
o 2: 02de42196ebe 'H'
|
o 1: 24b6387c8c8c 'F'
|
o 0: cd010b8cd998 'A'
Try to rollback after a rebase (fail):
$ hg rollback
no rollback information available
[1]
$ cd ..
Rebase with base == '.' => same as no arguments (from 3 onto 8):
$ hg clone -q -u 3 a2heads a2
$ cd a2
$ hg rebase --base .
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
@ 6: ed65089c18f8 'D'
|
o 5: 7621bf1a2f17 'C'
|
o 4: 9430a62369c6 'B'
|
o 3: e7ec4e813ba6 'I'
|
o 2: 02de42196ebe 'H'
|
o 1: 24b6387c8c8c 'F'
|
o 0: cd010b8cd998 'A'
$ cd ..
Rebase with dest == branch(.) => same as no arguments (from 3 onto 8):
$ hg clone -q -u 3 a a3
$ cd a3
$ hg rebase --dest 'branch(.)'
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
@ 8: ed65089c18f8 'D'
|
o 7: 7621bf1a2f17 'C'
|
o 6: 9430a62369c6 'B'
|
o 5: e7ec4e813ba6 'I'
|
o 4: 02de42196ebe 'H'
|
| o 3: eea13746799a 'G'
|/|
o | 2: 24b6387c8c8c 'F'
| |
| o 1: 9520eea781bc 'E'
|/
o 0: cd010b8cd998 'A'
$ cd ..
Specify only source (from 2 onto 8):
$ hg clone -q -u . a2heads a4
$ cd a4
$ hg rebase --source 'desc("C")'
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg
$ hg tglog
o 6: 7726e9fd58f7 'D'
|
o 5: 72c8333623d0 'C'
|
@ 4: e7ec4e813ba6 'I'
|
o 3: 02de42196ebe 'H'
|
o 2: 24b6387c8c8c 'F'
|
| o 1: 42ccdea3bb16 'B'
|/
o 0: cd010b8cd998 'A'
$ cd ..
Specify only dest (from 3 onto 6):
$ hg clone -q -u 3 a a5
$ cd a5
$ hg rebase --dest 6
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
@ 8: 8eeb3c33ad33 'D'
|
o 7: 2327fea05063 'C'
|
o 6: e4e5be0395b2 'B'
|
| o 5: e7ec4e813ba6 'I'
| |
| o 4: 02de42196ebe 'H'
| |
o | 3: eea13746799a 'G'
|\|
| o 2: 24b6387c8c8c 'F'
| |
o | 1: 9520eea781bc 'E'
|/
o 0: cd010b8cd998 'A'
$ cd ..
Specify only base (from 1 onto 8):
$ hg clone -q -u . a2heads a6
$ cd a6
$ hg rebase --base 'desc("D")'
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
o 6: ed65089c18f8 'D'
|
o 5: 7621bf1a2f17 'C'
|
o 4: 9430a62369c6 'B'
|
@ 3: e7ec4e813ba6 'I'
|
o 2: 02de42196ebe 'H'
|
o 1: 24b6387c8c8c 'F'
|
o 0: cd010b8cd998 'A'
$ cd ..
Specify source and dest (from 2 onto 7):
$ hg clone -q -u . a a7
$ cd a7
$ hg rebase --source 2 --dest 7
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg
$ hg tglog
o 8: 668acadedd30 'D'
|
o 7: 09eb682ba906 'C'
|
| @ 6: e7ec4e813ba6 'I'
|/
o 5: 02de42196ebe 'H'
|
| o 4: eea13746799a 'G'
|/|
o | 3: 24b6387c8c8c 'F'
| |
| o 2: 9520eea781bc 'E'
|/
| o 1: 42ccdea3bb16 'B'
|/
o 0: cd010b8cd998 'A'
$ cd ..
Specify base and dest (from 1 onto 7):
$ hg clone -q -u . a a8
$ cd a8
$ hg rebase --base 3 --dest 7
rebasing 1:42ccdea3bb16 "B"
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg
$ hg tglog
o 8: 287cc92ba5a4 'D'
|
o 7: 6824f610a250 'C'
|
o 6: 7c6027df6a99 'B'
|
| @ 5: e7ec4e813ba6 'I'
|/
o 4: 02de42196ebe 'H'
|
| o 3: eea13746799a 'G'
|/|
o | 2: 24b6387c8c8c 'F'
| |
| o 1: 9520eea781bc 'E'
|/
o 0: cd010b8cd998 'A'
$ cd ..
Specify only revs (from 2 onto 8)
$ hg clone -q -u . a2heads a9
$ cd a9
$ hg rebase --rev 'desc("C")::'
rebasing 2:5fddd98957c8 "C"
rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg
$ hg tglog
o 6: 7726e9fd58f7 'D'
|
o 5: 72c8333623d0 'C'
|
@ 4: e7ec4e813ba6 'I'
|
o 3: 02de42196ebe 'H'
|
o 2: 24b6387c8c8c 'F'
|
| o 1: 42ccdea3bb16 'B'
|/
o 0: cd010b8cd998 'A'
$ cd ..
Rebasing both a single revision and a merge in one command
$ hg clone -q -u . a aX
$ cd aX
$ hg rebase -r 3 -r 6 --dest 8
rebasing 3:32af7686d403 "D"
rebasing 6:eea13746799a "G"
saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-rebase.hg
$ cd ..
Test --tool parameter:
$ hg init b
$ cd b
$ echo c1 > c1
$ hg ci -Am c1
adding c1
$ echo c2 > c2
$ hg ci -Am c2
adding c2
$ hg up -q 0
$ echo c2b > c2
$ hg ci -Am c2b
adding c2
created new head
$ cd ..
$ hg clone -q -u . b b1
$ cd b1
$ hg rebase -s 2 -d 1 --tool internal:local
rebasing 2:e4e3f3546619 "c2b" (tip)
note: not rebasing 2:e4e3f3546619 "c2b" (tip), its destination already has all its changes
saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
$ hg cat c2
c2
$ cd ..
$ hg clone -q -u . b b2
$ cd b2
$ hg rebase -s 2 -d 1 --tool internal:other
rebasing 2:e4e3f3546619 "c2b" (tip)
saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
$ hg cat c2
c2b
$ cd ..
$ hg clone -q -u . b b3
$ cd b3
$ hg rebase -s 2 -d 1 --tool internal:fail
rebasing 2:e4e3f3546619 "c2b" (tip)
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg summary
parent: 1:56daeba07f4b
c2
branch: default
commit: 1 unresolved (clean)
update: 1 new changesets, 2 branch heads (merge)
phases: 3 draft
rebase: 0 rebased, 1 remaining (rebase --continue)
$ hg resolve -l
U c2
$ hg resolve -m c2
(no more unresolved files)
continue: hg rebase --continue
$ hg graft --continue
abort: no graft in progress
(continue: hg rebase --continue)
[255]
$ hg rebase -c --tool internal:fail
rebasing 2:e4e3f3546619 "c2b" (tip)
note: not rebasing 2:e4e3f3546619 "c2b" (tip), its destination already has all its changes
saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
$ hg rebase -i
abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit")
[255]
$ hg rebase --interactive
abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit")
[255]
$ cd ..
No common ancestor
$ hg init separaterepo
$ cd separaterepo
$ touch a
$ hg commit -Aqm a
$ hg up -q null
$ touch b
$ hg commit -Aqm b
$ hg rebase -d 0
nothing to rebase from d7486e00c6f1 to 3903775176ed
[1]
$ cd ..
|