RE: Help! Implementing Bi-Directional Merges

[Nesbitt, Steve]

Greg:

Thanks for the heads up on the html (I love Microsoft - give me back my linux box!)

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.

-steve

-----Original Message-----
From: address@hidden [mailto:address@hidden]
Sent: Monday, October 15, 2001 11:43 AM
To: Nesbitt, Steve
Cc: address@hidden
Subject: Re: Help! Implementing Bi-Directional Merges

[ On Monday, October 15, 2001 at 10:52:57 (-0700), Nesbitt, Steve wrote: ]
> Subject: Help! Implementing Bi-Directional Merges
>
> Another way to phrase the question is "How do I force the tip of one branch
> to be identical to the tip of another branch?"

Check out the source and target branches in different working
directories and then copy all the files from the source to the target
and check them in.

[[ BTW, don't send HTML e-mail to public mailing lists, or me ]]

--
                                                        Greg A. Woods

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