From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: Google Summer of Code 2009: GIT Date: Thu, 12 Mar 2009 11:43:52 -0700 Message-ID: <7v1vt2lgyf.fsf@gitster.siamese.dyndns.org> References: <49B74373.3090609@gmail.com> <7veix33f5e.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: saurabh gupta , Johannes Schindelin , git@vger.kernel.org To: david@lang.hm X-From: git-owner@vger.kernel.org Thu Mar 12 19:45:57 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LhpuS-0001lI-3a for gcvg-git-2@gmane.org; Thu, 12 Mar 2009 19:45:36 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755277AbZCLSoH convert rfc822-to-quoted-printable (ORCPT ); Thu, 12 Mar 2009 14:44:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754816AbZCLSoF (ORCPT ); Thu, 12 Mar 2009 14:44:05 -0400 Received: from a-sasl-fastnet.sasl.smtp.pobox.com ([207.106.133.19]:50929 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754334AbZCLSoE convert rfc822-to-8bit (ORCPT ); Thu, 12 Mar 2009 14:44:04 -0400 Received: from localhost.localdomain (unknown [127.0.0.1]) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTP id B7C0FA1302; Thu, 12 Mar 2009 14:44:01 -0400 (EDT) Received: from pobox.com (unknown [68.225.240.211]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTPSA id 7BAFCA1300; Thu, 12 Mar 2009 14:43:54 -0400 (EDT) In-Reply-To: (david@lang.hm's message of "Thu, 12 Mar 2009 11:00:12 -0700 (PDT)") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: C13B6470-0F35-11DE-8277-CFA5EBB1AA3C-77302942!a-sasl-fastnet.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: david@lang.hm writes: > On Thu, 12 Mar 2009, saurabh gupta wrote: > >> On Thu, Mar 12, 2009 at 3:17 AM, Junio C Hamano = wrote: > ... > with XML files it's possible to be symanticly identical, but not > identical as far as a text merge driver is concerned. > ... > a good XML merge driver would have options that you could set for a > particular file type to know about these sorts of things. Correct. >>> =C2=A0When it cannot autoresolve, >>> but there is no way to "mark" a tentative result with conflict mark= ers, it >>> can do the same thing as the "binary" driver and let the mergetool = backend >>> handle the "driver punted" case. >> >> I think you mean to say that in case, there is a conflict and the >> changes don't overlap, then merge driver leaves the file as it is an= d >> the merge helper will handle the file. > > if there is a conflict it should be because the changes do overlap. i= f > they don't overlap why is it a conflict? Correct. In such a case when the "driver" can be sure that the result = is reasonable, "helper" should not even kick in. That was the main point = of my suggestion, which you seem to have got right. Thanks.