Hello, I used 'fossil merge --cherry-pick' to grab individual patches from a different branch in my repo. After some thought, I decided I don't want those changes. They weren't committed to my branch so I'm trying to revert to the leaf. I can't seem to find the command to completely undo the cherry picking. I thought 'fossil merge --backout' might see the pending cherry-pick with the same commit hash and simply remove the specific cherry-pick but, instead, I now have a pending BACKOUT record!
I used 'fossil revert' to restore the files' content, but 'fossil status' still shows: BACKOUT 710d130fce71a94dab54f52dcd3f4e55d8ad4349 CHERRYPICK 710d130fce71a94dab54f52dcd3f4e55d8ad4349 CHERRYPICK a5c8e10a81a004626efeb84f055a4ecf5bb3b3f6 CHERRYPICK b2e81f9b4cf00fa1cfbb53218155bbf3bda7fae9 CHERRYPICK f53d51808c61d5622c321280ef0987ee93b6b1b8 How do I cancel these records? (aside from deleting the working directory and checking out the branch again -- I'd rather learn the correct way to do this.) Any help would be appreciated! -- Rich _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
