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

[Daniel Carosone]

On Sun, Jan 15, 2006 at 10:31:13PM -0500, Yury Polyanskiy wrote:
> 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.

Yeah, but on the other hand I don't think you can reasonably add a
file in a merge node that wasn't previously added by one of the
parents (or their ancestry paths).  What does it mean for a new file
to appear in a merge node for the first time?

If revisions coming from BK can include such a thing, or its otherwise
common and sensible practice, we may need to accommodate it too. I
don't think that's inherently a problem, but it's more than just
whether hooks are called: I can't think of a way to create such a
thing in monotone's current interface at all.

--
Dan.

pgpiDYZkKfg8X.pgp
Description: PGP signature