From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Johannes Schindelin Subject: Re: [PATCH] Remove uncontested renamed files during merge. Date: Wed, 13 Dec 2006 11:45:38 +0100 (CET) Message-ID: References: <20061213095540.GA25001@spearce.org> <20061213104244.GA9484@spearce.org> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII NNTP-Posting-Date: Wed, 13 Dec 2006 10:45:56 +0000 (UTC) Cc: Junio C Hamano , git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org X-Authenticated: #1490710 X-X-Sender: gene099@wbgn013.biozentrum.uni-wuerzburg.de In-Reply-To: <20061213104244.GA9484@spearce.org> X-Y-GMX-Trusted: 0 Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by dough.gmane.org with esmtp (Exim 4.50) id 1GuRcN-0007Tw-LG for gcvg-git@gmane.org; Wed, 13 Dec 2006 11:45:44 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932401AbWLMKpl (ORCPT ); Wed, 13 Dec 2006 05:45:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932447AbWLMKpk (ORCPT ); Wed, 13 Dec 2006 05:45:40 -0500 Received: from mail.gmx.net ([213.165.64.20]:60281 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S932401AbWLMKpk (ORCPT ); Wed, 13 Dec 2006 05:45:40 -0500 Received: (qmail invoked by alias); 13 Dec 2006 10:45:38 -0000 Received: from wbgn013.biozentrum.uni-wuerzburg.de (EHLO dumbo2) [132.187.25.13] by mail.gmx.net (mp010) with SMTP; 13 Dec 2006 11:45:38 +0100 To: Shawn Pearce Sender: git-owner@vger.kernel.org Hi, On Wed, 13 Dec 2006, Shawn Pearce wrote: > Johannes Schindelin wrote: > > > diff --git a/merge-recursive.c b/merge-recursive.c > > > index 9d53bcd..741d17f 100644 > > > --- a/merge-recursive.c > > > +++ b/merge-recursive.c > > > @@ -873,7 +873,7 @@ static int process_renames(struct path_list *a_renames, > > > struct diff_filespec src_other, dst_other; > > > int try_merge, stage = a_renames == renames1 ? 3: 2; > > > > > > - remove_file(1, ren1_src, 1); > > > + remove_file(1, ren1_src, 0); > > > > I _think_ that the "0" should be "!index_only". > > Err, actually "index_only". Since that's no_wd. Oops. Correct. My memory starts failing me. > -->-- corrected patch follows --<-- > Remove uncontested renamed files during merge. Acked-by: Johannes Schindelin Ciao, Dscho