RE: Help! Implementing Bi-Directional Merges

[Greg A. Woods]

[ On Monday, October 15, 2001 at 12:03:11 (-0700), Nesbitt, Steve wrote: ]
> Subject: RE: Help! Implementing Bi-Directional Merges
> 
> Thanks for the heads up on the html (I love Microsoft - give me back my
> linux box!)

Hah!  :-)  So, why don't you just take it back?  Nobody _needs_ M$.
Use of M$ software is a choice -- all you have to do to not use it is to
open your mind to the many alternatives.

> The question I have with this approach is what does my diff look like
> afterwards? For example, if my base version is 1.3 and I copy the entire
> file from the branch and check it in to make version 1.4, what would my cvs
> diff look like between 1.3 and 1.4? My potential objection is that CVS would
> see this as a completely new file with every line changed. I probably can
> live with that, but I don't like it.  I'll have to test it.

Who cares?  You said you want to ensure that "the tip of one branc is
identical to the tip of another branch".  Make it so the easy fool-proof
way and then afterwards you can look at the resulting diff if you still
wish to see what was different about it beforehand.

-- 
                                                        Greg A. Woods

+1 416 218-0098      VE3TCP      <address@hidden>     <address@hidden>
Planix, Inc. <address@hidden>;   Secrets of the Weird <address@hidden>