From: John A Meinel <john@arbash-meinel.com>
User-Agent: Mozilla Thunderbird 0.9 (Windows/20041103)
MIME-Version: 1.0
To: Zenaan Harkness <zen@cashpoolcomps.com>
Subject: Re: [Gnu-arch-users] diff markers/ star merge
References: <1101070919.6134.11.camel@localhost.localdomain>	<41A112A4.4070207@panoramicfeedback.com>
	<1101076091.6134.82.camel@localhost.localdomain>
In-Reply-To: <1101076091.6134.82.camel@localhost.localdomain>
Cc: arch <gnu-arch-users@gnu.org>
Precedence: list
Content-Type: multipart/mixed; boundary="===============1047392510=="
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: 7035
Lines: 176
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--===============1047392510==
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enig1F90FEE25B76C374460F2AE6"

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig1F90FEE25B76C374460F2AE6
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Zenaan Harkness wrote:
> On Mon, 2004-11-22 at 09:11, Aaron Bentley wrote:
> 
>>Zenaan Harkness wrote:
>>
>>
>>>So, I can tla undo, tla star-merge then tla redo, except when I tla redo
>>>I get the .rej conflict files rather than diff3 in-file markers.
>>
>>I realize that .rej files may be unfamiliar, but now that I'm used to 
>>them, I find them quite readable.  The top half shows the text the patch 
>>was expecting, the bottom shows what the patch tried to turn it into.
>>
>>
>>>Is there a way to play with my branches to achieve this (get the diff3
>>>in-file markers when I re-do)?
>>
>>AFAICT, there's no point in doing this.  If you star-merge directly, 
>>you'll get the same thing,
> 
> 
> But that's not quite what I need:
> 
> 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.
> 
> 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?
> 

I would recommend using a 3rd party tool that supports .rej files. I 
thought you've used emacs (which Tom at least stated supports .rej) 
otherwise I think meld and wiggle are both programs that support .rej 
files. Meld being a gui.

John
=:->


--------------enig1F90FEE25B76C374460F2AE6
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Cygwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFBoRbcJdeBCYSNAAMRAoAtAKC0ASX6kCiWYzZoZ+8sFE62pt4mNACgh36/
KASjs+qL/tyuEVGBqQbW8zw=
=lmG3
-----END PGP SIGNATURE-----

--------------enig1F90FEE25B76C374460F2AE6--


--===============1047392510==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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