New pbranch command pfold

[peso]

Hi list

I'm working on the fold operation described at
http://arrenbrecht.ch/mercurial/pbranch/insert.htm#pagetoc__2

pbranch already has a command pbackout for destructive deletion, but
the alternative pfold which "deletes" a patch by folding it into its
children is a manual operation.

I would like to have the fold operation in TortoiseHg, so I started
out coding all these manual operations but in the end realized that it
would fit better in the pbranch extension as a new command.


My question to you, as pbranch users, is which behavior would you
prefer if you tried to pfold a patch that is not in .hg/pgrpah?


For normal users this could happen
* if you were about to start a pmerge
* if you were in the middle of a pmerge operation with a merge that
failed
* if you had pulled from a remote repository that added patch branches
(this does not update .hg/pgraph)
* some other yet-unknown error situation

Regards,
Peer