| quark |
| Restricted Project |
Upstream made these changes. Let's follow along.
Ran the tests
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-fastpartialmatch.t (2 lines) | |||
| M | tests/test-fbamend.t (2 lines) | |||
| M | tests/test-fbhistedit-rebase-interactive.t (6 lines) |
| user: test | user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: first | summary: first | ||||
| $ hg histedit --commands - <<EOF | $ hg histedit --commands - <<EOF | ||||
| > pick 353c4093de9e 2 tohistedit | > pick 353c4093de9e 2 tohistedit | ||||
| > pick 51e0111a3ca1 1 afterstrip | > pick 51e0111a3ca1 1 afterstrip | ||||
| > EOF | > EOF | ||||
| saved backup bundle to $TESTTMP/cloned/.hg/strip-backup/51e0111a3ca1-ae8f0808-backup.hg (glob) | saved backup bundle to $TESTTMP/cloned/.hg/strip-backup/51e0111a3ca1-ae8f0808-histedit.hg (glob) | ||||
| $ hg log --graph | $ hg log --graph | ||||
| @ changeset: 2:8dc08dfc2ed8 | @ changeset: 2:8dc08dfc2ed8 | ||||
| | tag: tip | | tag: tip | ||||
| | user: test | | user: test | ||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| | summary: afterstrip | | summary: afterstrip | ||||
| | | | | ||||
| o changeset: 1:1d6b19400cfd | o changeset: 1:1d6b19400cfd | ||||
| | | | | | | ||||
| | o 83455f1f6049 aa | | o 83455f1f6049 aa | ||||
| |/ | |/ | ||||
| | o 3f6197b00eba extra commit to test multiple heads | | o 3f6197b00eba extra commit to test multiple heads | ||||
| |/ | |/ | ||||
| o cb9a9f314b8b a | o cb9a9f314b8b a | ||||
| $ hg histedit --continue | $ hg histedit --continue | ||||
| saved backup bundle to $TESTTMP/repo/.hg/strip-backup/83455f1f6049-922a304e-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/83455f1f6049-922a304e-histedit.hg (glob) | ||||
| $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | ||||
| @ 0f83a9508203 c | @ 0f83a9508203 c | ||||
| | | | | ||||
| o 3166f3b5587d commit --amend message | o 3166f3b5587d commit --amend message | ||||
| | | | | ||||
| o 048e86baa19d message from exec | o 048e86baa19d message from exec | ||||
| | | | | ||||
| | o 3f6197b00eba extra commit to test multiple heads | | o 3f6197b00eba extra commit to test multiple heads | ||||
| | | | | ||||
| o 0:cb9a9f314b8b a | o 0:cb9a9f314b8b a | ||||
| Simple rebase with -s and -d | Simple rebase with -s and -d | ||||
| $ hg update 8 | $ hg update 8 | ||||
| 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| $ HGEDITOR=true hg rebase -i -s 8 -d 5 | $ HGEDITOR=true hg rebase -i -s 8 -d 5 | ||||
| saved backup bundle to $TESTTMP/r/.hg/strip-backup/cf7e1bc6a982-9ce57ee5-backup.hg (glob) | saved backup bundle to $TESTTMP/r/.hg/strip-backup/cf7e1bc6a982-9ce57ee5-histedit.hg (glob) | ||||
| $ hg log -G -T '{rev}:{node|short} {desc|firstline}\n' | $ hg log -G -T '{rev}:{node|short} {desc|firstline}\n' | ||||
| @ 9:bb8affa27bd8 i | @ 9:bb8affa27bd8 i | ||||
| | | | | ||||
| | o 8:8d0611d6e5f2 conflict f | | o 8:8d0611d6e5f2 conflict f | ||||
| | | | | | | ||||
| | | o 7:7523912c6e49 h | | | o 7:7523912c6e49 h | ||||
| | | | | | | | | ||||
| (hg histedit --continue to resume) | (hg histedit --continue to resume) | ||||
| [1] | [1] | ||||
| $ echo resolved > f | $ echo resolved > f | ||||
| $ hg resolve --mark f | $ hg resolve --mark f | ||||
| (no more unresolved files) | (no more unresolved files) | ||||
| continue: hg histedit --continue | continue: hg histedit --continue | ||||
| $ hg histedit --continue | $ hg histedit --continue | ||||
| saved backup bundle to $TESTTMP/r/.hg/strip-backup/8d0611d6e5f2-0e0da94b-backup.hg (glob) | saved backup bundle to $TESTTMP/r/.hg/strip-backup/8d0611d6e5f2-0e0da94b-histedit.hg (glob) | ||||
| $ hg log -G -T '{rev}:{node|short} {desc|firstline}\n' | $ hg log -G -T '{rev}:{node|short} {desc|firstline}\n' | ||||
| @ 9:b6ca70f8129d conflict f | @ 9:b6ca70f8129d conflict f | ||||
| | | | | ||||
| o 8:bb8affa27bd8 i | o 8:bb8affa27bd8 i | ||||
| | | | | ||||
| | o 7:7523912c6e49 h | | o 7:7523912c6e49 h | ||||
| | | | | | | ||||
| | | | | ||||
| o 0:cb9a9f314b8b a | o 0:cb9a9f314b8b a | ||||
| Rebase with base | Rebase with base | ||||
| $ hg update 7 | $ hg update 7 | ||||
| 2 files updated, 0 files merged, 5 files removed, 0 files unresolved | 2 files updated, 0 files merged, 5 files removed, 0 files unresolved | ||||
| $ HGEDITOR=true hg rebase -i -b . -d 9 | $ HGEDITOR=true hg rebase -i -b . -d 9 | ||||
| saved backup bundle to $TESTTMP/r/.hg/strip-backup/0ba40a7dd69a-033489e1-backup.hg (glob) | saved backup bundle to $TESTTMP/r/.hg/strip-backup/0ba40a7dd69a-033489e1-histedit.hg (glob) | ||||
| $ hg log -G -T '{rev}:{node|short} {desc|firstline}\n' | $ hg log -G -T '{rev}:{node|short} {desc|firstline}\n' | ||||
| @ 9:50cf975d06ef h | @ 9:50cf975d06ef h | ||||
| | | | | ||||
| o 8:ba6932766227 g | o 8:ba6932766227 g | ||||
| | | | | ||||
| o 7:b6ca70f8129d conflict f | o 7:b6ca70f8129d conflict f | ||||
| | | | | ||||
| o 6:bb8affa27bd8 i | o 6:bb8affa27bd8 i | ||||