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 trick), as this merge did nothing, but added a CHERRYPICK to the changes list. Thanks to Noam Postavsky, I know that I can `--cherrypick` with `--dry-run`, and see if there is something to merge. But that's not what fossil is about. Looking at the code, I see no reason why merge command says "Merge skipped because it is a no-op." only with `--dry-run` option.
On Mon, Oct 19, 2015 at 7:53 PM, Richard Hipp <d...@sqlite.org> wrote: > On 10/19/15, Rich Neswold <rich.nesw...@gmail.com> wrote: >> >> I used 'fossil revert' to restore the files' content, but 'fossil >> status' still shows: >> >> BACKOUT 710d130fce71a94dab54f52dcd3f4e55d8ad4349 >> CHERRYPICK 710d130fce71a94dab54f52dcd3f4e55d8ad4349 >> CHERRYPICK a5c8e10a81a004626efeb84f055a4ecf5bb3b3f6 >> CHERRYPICK b2e81f9b4cf00fa1cfbb53218155bbf3bda7fae9 >> CHERRYPICK f53d51808c61d5622c321280ef0987ee93b6b1b8 >> > > I tried this and the "fossil revert" worked for me - it cleared out > all of the cherrypicks. > > What version of Fossil are you running? (What is the output of > "fossil version". Mine shows "This is fossil version 1.34 > [3cff1b8f0a] 2015-10-16 20:05:34 UTC" for example.) > > Assuming you are running a recent Fossil and are still having trouble, > can you send a more detailed sequence of commands so that we can try > to repro the problem? > > Another way to reset back to the last committed version is "fossil co > current --force". Does that work any better for you? > > -- > D. Richard Hipp > d...@sqlite.org > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- I remain, Arseniy Terekhin _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
