From user-return-17687-apmail-couchdb-user-archive=couchdb.apache.org@couchdb.apache.org Mon Aug 29 16:36:46 2011 Return-Path: X-Original-To: apmail-couchdb-user-archive@www.apache.org Delivered-To: apmail-couchdb-user-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5F8017408 for ; Mon, 29 Aug 2011 16:36:46 +0000 (UTC) Received: (qmail 9817 invoked by uid 500); 29 Aug 2011 16:36:44 -0000 Delivered-To: apmail-couchdb-user-archive@couchdb.apache.org Received: (qmail 9785 invoked by uid 500); 29 Aug 2011 16:36:44 -0000 Mailing-List: contact user-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: user@couchdb.apache.org Delivered-To: mailing list user@couchdb.apache.org Received: (qmail 9772 invoked by uid 99); 29 Aug 2011 16:36:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2011 16:36:43 +0000 X-ASF-Spam-Status: No, hits=2.2 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of jens@couchbase.com designates 206.225.164.32 as permitted sender) Received: from [206.225.164.32] (HELO EXHUB020-5.exch020.serverdata.net) (206.225.164.32) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2011 16:36:36 +0000 Received: from EXVMBX020-1.exch020.serverdata.net ([169.254.4.169]) by EXHUB020-5.exch020.serverdata.net ([206.225.164.32]) with mapi; Mon, 29 Aug 2011 09:36:14 -0700 From: Jens Alfke To: "user@couchdb.apache.org" Date: Mon, 29 Aug 2011 09:36:14 -0700 Subject: Re: conflict determination not by fields Thread-Topic: conflict determination not by fields Thread-Index: AcxmacSSzKMi9tS3QhK/PK6PeBDSvQ== Message-ID: <6EC2731F-26DF-4897-9ED6-99D78A58BB87@couchbase.com> References: <44FBDC4C-26E3-4935-915F-EE0BA94267EC@couchbase.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: multipart/alternative; boundary="_000_6EC2731F26DF48979ED699D78A58BB87couchbasecom_" MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org --_000_6EC2731F26DF48979ED699D78A58BB87couchbasecom_ Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable On Aug 29, 2011, at 9:03 AM, gaoyong pan wrote: The way of "diff" and "patch" sounds a general approach, is it possible make this just a built-in capability for couchDB, a general json diff/patch support. Diff/patch also produces conflicts that have to be resolved at a higher lev= el =97 ever had to do manual merging in a revision control system like SVN = or Git? Face it, there is no magic solution. =97Jens --_000_6EC2731F26DF48979ED699D78A58BB87couchbasecom_--