Received: from spf1.us4.outblaze.com (spf1.us4.outblaze.com [205.158.62.23]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id iALN2S4h025496 for ; Sun, 21 Nov 2004 23:02:29 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf1.us4.outblaze.com (Postfix) with ESMTP id B823853A31 for ; Sun, 21 Nov 2004 23:02:30 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CW0rz-0007An-BV for migo@homemail.com; Sun, 21 Nov 2004 18:11:47 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CW0rb-0007Ac-7d for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:11:23 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CW0ra-0007AH-F1 for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:11:22 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CW0ra-0007A7-Cq for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:11:22 -0500 Received: from [80.91.229.2] (helo=main.gmane.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CW0iJ-0007CP-Nd for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:01:47 -0500 Received: from root by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1CW0iI-0008Ib-00 for ; Mon, 22 Nov 2004 00:01:46 +0100 Received: from anyanka.rfc1149.net ([81.56.47.149]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 22 Nov 2004 00:01:46 +0100 Received: from sam by anyanka.rfc1149.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 22 Nov 2004 00:01:46 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: gnu-arch-users@gnu.org From: Samuel Tardieu Date: 21 Nov 2004 23:54:05 +0100 Organization: Avian Carrier & Friends Message-ID: <87brdqu836.fsf@beeblebrox.rfc1149.net> References: <1101070919.6134.11.camel@localhost.localdomain> <41A112A4.4070207@panoramicfeedback.com> <1101076091.6134.82.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: anyanka.rfc1149.net User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 X-Leafnode-NNTP-Posting-Host: 2001:660:330f:f810:200:39ff:fe25:3aa2 Subject: [Gnu-arch-users] Re: diff markers/ star merge X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 883 Lines: 16 >>>>> "Zenaan" == Zenaan Harkness writes: Zenaan> So, I want to undo, star-merge in $stable, then commit (!), Zenaan> then redo so I can continue on. Except I want in-file diff3 Zenaan> markers when I redo, because my change touches hundreds of Zenaan> files. Why not commit your work into another branch, so that you can make sure that you do not loose any of your work (should you realize that you need some other modifications before merging to ease the merge) and then use star-merge between your star-merged-from-upstream branch and your development branch? Sam -- Samuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/sam _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/