Re: [Monotone-devel] Multiple or zero content marks?

[Thomas Keller]

Am 23.04.10 15:15, schrieb Timothy Brownawell:
> On 04/23/2010 07:02 AM, Thomas Keller wrote:
>>
>> Hi!
>>
>> Thomas Moschny and I wondered on IRC under which circumstances a node in
>> a roster could have zero or more than one content mark - the API for
>> get_content_changed lists as valid response "zero or more" content_mark
>> stanzas, but we both could not quite imagine how any other value than
>> one should be possible there...
> 
> A directory won't have a content mark (because it doesn't have any
> content). A file will always at least one.
>    ( see roster.cc roster_t::check_sane_against() )
> 
> Multiple content marks happen when you make the same change on both
> sides of a merge (assuming some other files changed differently on the
> different sides, so the revisions containing the marked nodes here don't
> collapse into one):
>    ( see roster.cc mark_merged_scalar() )
> 
>     b
>    / \
>   a*  a*
>    \ /
>     a    <-- this node has two content marks
>     |
>     a    <-- this node also has the same two marks
> 

Thanks a lot for this - I begin to remember all that again. I've played
around with it a bit and could even create three content marks on a node
which was clean-merged two times, but this should be rather uncommon.
I'll tweak the docs and include your example there.

Thanks again,
Thomas.

-- 
GPG-Key 0x160D1092 | address@hidden | http://thomaskeller.biz
Please note that according to the EU law on data retention, information
on every electronic information exchange might be retained for a period
of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en

signature.asc
Description: OpenPGP digital signature