couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Paul Davis <paul.joseph.da...@gmail.com>
Subject Re: couchdb conflict resolution
Date Tue, 15 Feb 2011 20:50:10 GMT
On Tue, Feb 15, 2011 at 3:45 PM, Aaron Boxer <boxerab@gmail.com> wrote:
> Thanks. So, if I learn me some Erlang and read couch_key_tree.erl,
> I will understand how merging is done?
>

There is no merging. Conflicts are resolved by deleting one of the
conflicted revisions. This being a major departure from the Git model.

> Also, where is the code for generating a version id?
>

couch_db:new_revid/1

> appreciate the help,
> Aaron
>
>
>
> On Tue, Feb 15, 2011 at 3:33 PM, Paul Davis <paul.joseph.davis@gmail.com> wrote:
>> On Tue, Feb 15, 2011 at 3:11 PM, Aaron Boxer <boxerab@gmail.com> wrote:
>>> Thanks, Paul!  This is exactly the level of detail and granularity I
>>> am looking for.
>>>
>>> GIT is mentioned a few times in this issue write-up. So, does couch now use
>>> a modified form of GIT revision tracking?
>>>
>>
>> Its similar in theory but you'd be a bit hard pressed to pick that out
>> without an pretty good understanding of both. Its merely just a
>> reference that they both use a form of inverted-merkle tree, but
>> beyond that the similarities are generally thin.
>>
>

Mime
View raw message