Mercurial > evolve
comparison tests/test-evolve.t @ 1188:0c879e986ce4
test: adapt to core change in graft and rebase
The ouput changed we have to adapt
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sun, 14 Dec 2014 12:19:40 -0800 |
| parents | cc3e68120185 |
| children | af9fd422adbb |
comparison
equal
deleted
inserted
replaced
| 1187:253293df84a6 | 1188:0c879e986ce4 |
|---|---|
| 494 | o 1:73d38bb17fd7@default(draft) add 1 | 494 | o 1:73d38bb17fd7@default(draft) add 1 |
| 495 |/ | 495 |/ |
| 496 o 0:8685c6d34325@default(draft) add 0 | 496 o 0:8685c6d34325@default(draft) add 0 |
| 497 | 497 |
| 498 $ hg graft -r3 -O | 498 $ hg graft -r3 -O |
| 499 grafting revision 3 | 499 grafting 3:0e84df4912da "add 3" |
| 500 $ hg graft -r1 -o 2 | 500 $ hg graft -r1 -o 2 |
| 501 grafting revision 1 | 501 grafting 1:73d38bb17fd7 "add 1" |
| 502 $ glog --hidden | 502 $ glog --hidden |
| 503 @ 6:acb28cd497b7@default(draft) add 1 | 503 @ 6:acb28cd497b7@default(draft) add 1 |
| 504 | | 504 | |
| 505 o 5:0b9e50c35132@default(draft) add 3 | 505 o 5:0b9e50c35132@default(draft) add 3 |
| 506 | | 506 | |
| 524 $ echo 2 > 1 | 524 $ echo 2 > 1 |
| 525 $ hg ci -Am conflict 1 | 525 $ hg ci -Am conflict 1 |
| 526 created new head | 526 created new head |
| 527 $ hg up -qC 6 | 527 $ hg up -qC 6 |
| 528 $ hg graft -O 7 | 528 $ hg graft -O 7 |
| 529 grafting revision 7 | 529 grafting 7:a5bfd90a2f29 "conflict" (tip) |
| 530 merging 1 | 530 merging 1 |
| 531 warning: conflicts during merge. | 531 warning: conflicts during merge. |
| 532 merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark') | 532 merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark') |
| 533 abort: unresolved conflicts, can't continue | 533 abort: unresolved conflicts, can't continue |
| 534 (use hg resolve and hg graft --continue) | 534 (use hg resolve and hg graft --continue) |
| 537 7:a5bfd90a2f29 stable | 537 7:a5bfd90a2f29 stable |
| 538 $ echo 3 > 1 | 538 $ echo 3 > 1 |
| 539 $ hg resolve -m 1 | 539 $ hg resolve -m 1 |
| 540 (no more unresolved files) | 540 (no more unresolved files) |
| 541 $ hg graft --continue -O | 541 $ hg graft --continue -O |
| 542 grafting revision 7 | 542 grafting 7:a5bfd90a2f29 "conflict" (tip) |
| 543 $ glog --hidden | 543 $ glog --hidden |
| 544 @ 8:920e58bb443b@default(draft) conflict | 544 @ 8:920e58bb443b@default(draft) conflict |
| 545 | | 545 | |
| 546 | x 7:a5bfd90a2f29@default(draft) conflict | 546 | x 7:a5bfd90a2f29@default(draft) conflict |
| 547 | | | 547 | | |