Re: [Monotone-devel] 2 explicit merges which are the same, apart from destination branch => invariant violation

[Daniel Carosone]

On Mon, Jun 05, 2006 at 11:49:36AM +0200, Marcel van der Boom wrote:
> I assume it tries to create the same a3a93... rev.
> 
> Couldn't monotone recognize "oh, it's already there, lets put the  
> cert on it then" or am I doing something wrong?

It could, and there may still be an issue here, but you are also
missing another way of doing this that's staring you in the face.

You're trying to create the same revision twice, and you already know
it will produce the same revision because it has identical contents
and identical ancestry. 

Leaving aside the error handling, there's no need to do the merge
twice - all you need to do is give the first merge result the two
branch certs, one in the merge and the other with an approve right
after.

--
Dan.

pgp5qjwfHl1CE.pgp
Description: PGP signature