On Oct 9, 2015, at 11:53 AM, Arseniy Terekhin <[email protected]> wrote: > > Let's say we are on fossil trunk[b4b551aa66] and we want to know > if delta in [1c708ccc8f] is still intact, and if it is not, apply it. > The only way I see, is to do `fossil merge 1c708ccc8f --cherrypick`. > And it kinda works, as `fossil di` shows no output, but cherrypick > action is still shown in `fossil changes`. It would be nice, if it is > not, wouldn't it?
Why can’t you just ask f diff -r 1c708ccc8f ? That tells you whether you need to do the merge or not. _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
