Re: [fossil-users] Cancelling a cherry-pick/backout

2015-10-19 Thread Arseniy Terekhin
Let me take us back to my issue (http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg21628.html): >From fossil's trunk do `fosstil merge 1c708ccc8f52dd9952883c6be5be1eee81adbf0f --cherrypick` and you won't be able to `fossil revert` (yes,`fossil co current --force` will do the

Re: [fossil-users] Cancelling a cherry-pick/backout

2015-10-19 Thread Rich Neswold
On Mon, Oct 19, 2015 at 11:53 AM, Richard Hipp wrote: > I tried this and the "fossil revert" worked for me - it cleared out > all of the cherrypicks. Looking through my command history I see, whenever I tried 'fossil revert', I also specified a version tag which displayed "the

[fossil-users] Cancelling a cherry-pick/backout

2015-10-19 Thread Rich Neswold
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

Re: [fossil-users] Cancelling a cherry-pick/backout

2015-10-19 Thread Richard Hipp
On 10/19/15, Rich Neswold wrote: > > I used 'fossil revert' to restore the files' content, but 'fossil > status' still shows: > > BACKOUT 710d130fce71a94dab54f52dcd3f4e55d8ad4349 > CHERRYPICK 710d130fce71a94dab54f52dcd3f4e55d8ad4349 > CHERRYPICK