[Gnu-arch-users] Re: How to know which revision a changeset is refering to?

[Jan Hudec]

On Mon, Jul 05, 2004 at 16:41:31 +0900, Miles Bader wrote:
> Jan Hudec <address@hidden> writes:
> > And this is the very situation where it would be useful to have record
> > agains which version the changeset was made. Let's say I hack on
> > something. Then find that it won't fly until I merge changes from
> > someone else. They are a little bigger though. And when I redo, it
> > produces conflicts. I would like to be able to use diff3 on it.
> 
> YMMV I suppose -- I find that diff3 usually isn't worth the bother, and
> indeed quite often seems to make conflicts more confusing.

I would actualy not use diff3. I would actualy use vim in diff mode
(someone else might use emacs in diff mode, which is just about the
same). And THAT is definitely better than applying reject by hand.

-------------------------------------------------------------------------------
                                                 Jan 'Bulb' Hudec 
<address@hidden>

signature.asc
Description: Digital signature