monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-devel] Re: What does it mean when a revision hastwobranch cert


From: Bruce Stephens
Subject: [Monotone-devel] Re: What does it mean when a revision hastwobranch certs?
Date: Thu, 06 Dec 2007 16:51:20 +0000
User-agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux)

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).




reply via email to

[Prev in Thread] Current Thread [Next in Thread]