From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonas Fonseca Subject: Re: Problem with cg-merge Date: Mon, 30 May 2005 00:58:57 +0200 Message-ID: <20050529225857.GA10715@diku.dk> References: <1117379092.7072.90.camel@pegasus> <20050529180742.GA31388@diku.dk> <1117390650.7072.100.camel@pegasus> <20050529184830.GM1036@pasky.ji.cz> <20050529211524.GB32141@diku.dk> <20050529224042.GV1036@pasky.ji.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Marcel Holtmann , GIT Mailing List X-From: git-owner@vger.kernel.org Mon May 30 00:58:12 2005 Return-path: Received: from vger.kernel.org ([12.107.209.244]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DcWiP-0002LF-Ex for gcvg-git@gmane.org; Mon, 30 May 2005 00:57:05 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261320AbVE2W7W (ORCPT ); Sun, 29 May 2005 18:59:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261374AbVE2W7V (ORCPT ); Sun, 29 May 2005 18:59:21 -0400 Received: from nhugin.diku.dk ([130.225.96.140]:9717 "EHLO nhugin.diku.dk") by vger.kernel.org with ESMTP id S261228AbVE2W7B (ORCPT ); Sun, 29 May 2005 18:59:01 -0400 Received: by nhugin.diku.dk (Postfix, from userid 754) id CC48A6E21E6; Mon, 30 May 2005 00:58:26 +0200 (CEST) Received: from ask.diku.dk (ask.diku.dk [130.225.96.225]) by nhugin.diku.dk (Postfix) with ESMTP id 882136E2105; Mon, 30 May 2005 00:58:26 +0200 (CEST) Received: by ask.diku.dk (Postfix, from userid 3873) id 25E1661FE0; Mon, 30 May 2005 00:58:58 +0200 (CEST) To: Petr Baudis Content-Disposition: inline In-Reply-To: <20050529224042.GV1036@pasky.ji.cz> User-Agent: Mutt/1.5.6i X-Spam-Status: No, hits=-4.9 required=5.0 tests=BAYES_00 autolearn=ham version=2.60 X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on nhugin.diku.dk X-Spam-Level: Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Petr Baudis wrote Mon, May 30, 2005: > Dear diary, on Sun, May 29, 2005 at 11:15:24PM CEST, I got a letter > where Jonas Fonseca told me that... > > There is another problem I've noticed in the work on the cogito > > manpages. To make it easier to update the ``external'' patch I maintain > > I have added the files Documentation/make-cg-asciidoc and > > Documentation/make-cogito-asciidoc but not actually committed them. > > That way cg-diff will include them (diffed against /dev/null) which I > > like very much. However, when I cg-update from my local cogito origin > > cg-merge will fast-forward using cg-diff which results in rejects when > > patching the local changes due to the files already existing. > > > > One possibility would be to revert all local changes with the patch > > generated by cg-diff since most of them will be overwritten anyway. > > This would remove uncommitted added files but it would probably require > > use of the GIT metadata to get the fast-forwarding right with modes > > intact. > > I'm confused. Are you suggesting that we just throw away any local > changes when updating? That sounds horrible - it's something the user > has full right not to expect and I'd be very careful about it. Forget what I suggested. The current way to cg-diff then update the tree and apply the local changes on top of that does handled locally added but uncommited files. > In the longer term we shouldn't muck with diff | patch but instead do a > three-way merge on the local changes too. Yes, that sounds nice. -- Jonas Fonseca