[fossil-users] Empty merge --cherrypick

Hello! 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

Re: [fossil-users] Empty merge --cherrypick

On Oct 9, 2015, at 11:53 AM, Arseniy Terekhin 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

Re: [fossil-users] Empty merge --cherrypick

On Oct 9, 2015, at 11:56 AM, Warren Young wrote: > > Why can’t you just ask f diff -r 1c708ccc8f ? That tells you whether you > need to do the merge or not. Never mind. For that to do what you want, diff would need a --cherrypick option, too.

Re: [fossil-users] Empty merge --cherrypick

On Fri, Oct 9, 2015 at 1:57 PM, Warren Young wrote: > On Oct 9, 2015, at 11:56 AM, Warren Young wrote: >> >> Why can’t you just ask f diff -r 1c708ccc8f ? That tells you whether you >> need to do the merge or not. > > Never mind. For that to do what you