Message-ID: <jwv1xelk7ho.fsf-monnier+gmane.comp.version-control.arch.user@gnu.org>
To: gnu-arch-users@gnu.org
References: <1101070919.6134.11.camel@localhost.localdomain>
	<41A112A4.4070207@panoramicfeedback.com>
	<1101076091.6134.82.camel@localhost.localdomain>
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 22 Nov 2004 14:31:29 -0500
In-Reply-To: <1101076091.6134.82.camel@localhost.localdomain> (Zenaan
	Harkness's message of "Mon, 22 Nov 2004 09:28:11 +1100")
User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/21.3.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: [Gnu-arch-users] Re: diff markers/ star merge
Precedence: list
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: 1141
Lines: 32
> I have a month's work, I need to do a bit more work on it _before_
> merging, but management is demanding a merge/release.

> So, I want to undo, star-merge in $stable, then commit (!), then redo so
> I can continue on. Except I want in-file diff3 markers when I redo,
> because my change touches hundreds of files.

Depending on the scale of your changes and of the merged changes, you might
want to set up a branch, in which case star-nerge will work just dandy,

> With so many files, it's a royal PITA to have to manually compare diff
> .rej files with originals, locate the appropriate lines in the code, and
> cut and paste between the .rej and the original.

> Surely this makes sense? Or am I completely missing something?

Try `wiggle' which applies a patch and gives diff3 markers rather than
a .rej file (or, seen from another viewpoint, it takes a .rej file an turns
it into diff3 markers).


        Stefan


_______________________________________________
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/