RE: [Monotone-devel] Re: What does it mean when a revision hastwobranchcerts?

[Craig L. Ching]

Thanks Bruce and Lapo, I appreciate the explanations, they're invaluable
for what I'm doing.

Cheers,
Craig

> -----Original Message-----
> From: address@hidden
> [mailto:address@hidden On
Behalf
> Of Bruce Stephens
> Sent: Thursday, December 06, 2007 10:51 AM
> To: address@hidden
> Subject: [Monotone-devel] Re: What does it mean when a revision
> hastwobranchcerts?
> 
> Bruce Stephens <address@hidden> writes:
> 
> [...]
> 
> > Ordinarily that's not common, but it's not unusual for merges to end
> > up with two copies of the normal certs (author, date, branch,
> > changelog), with the branch and changelog the same (automatically
> > generated, and signed by the two author keys).
> 
> Obviously this happens when two people notice a fork, independently
> merge it, then push the result back.  Presuming the merge is automatic
> (or is resolved identically manually), the two merged revisions will
> be identical.
> 
> Not that uncommon, so you certainly need to support it (or at least
> your tool mustn't fall over if it finds that).
> 
> 
> _______________________________________________
> Monotone-devel mailing list
> address@hidden
> http://lists.nongnu.org/mailman/listinfo/monotone-devel