Re: [Monotone-devel] Commit a child of 2 parents

[Yury Polyanskiy]

This won't handle all situations: suppose a merge revision that adds a
file. I can't direct monotone to add a new file via merge hook.

Yury.


On Mon, 2006-01-16 at 14:19 +1100, Daniel Carosone wrote:
> Yes, you'll need to set manual_merge to true. A switch to merge to
> imply this for all files in this commit is probably better than
> forcing files to have inappropriate attributes.
> 
> --
> Dan.