Re: [StGit PATCH] Convert "sink" to the new infrastructure

On 2008-09-14 22:19:41 +0100, Catalin Marinas wrote:

> I wasn't used to reading documentation in StGit files :-). Thanks
> for the info, I'll repost.

It was you who asked for in-code docs. :-) The new-infrastructure code actually looks half decent in epydoc nowadays.

> I'll make the default behaviour to cancel the transaction and revert
> to the original state unless an option is given to allow conflicts.

What I've always wanted is "sink this patch as far as it will go without conflicting". This comes awfully close.

BTW, this kind of flag might potentially be useful in many commands (with default value on or off depending on the command). Maybe

  --conflicts=roll-back|stop-before|allow

to indicate if the command should roll back the whole operation, stop just before the conflicting push, or allow conflicts.

> I can see calls to pop_patches(lambda pn: pn in patch_list). I think
> we could have a helper for this.

Indeed.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle