mergepoint and null delta results (was Re: [cvsnt] Latest Updates)
Phil Richards
news at derived-software.ltd.uk
Thu Feb 5 18:51:11 GMT 2004
On 2004-02-05, I wrote:
> Well, I've done my first "production" two-way merge and had mostly
> positive results. The merging (as before) worked fine, and no null
> deltas were made.
[...]
> This is true - but one might hope that the server would notice that
> the only modification on the branch was a merge from the mainline,
> and that the version on the branch was the same as the deleted one
> on the mainline, and mark it as "removed".
What I also meant to say was: I'll take a look at this to see if there
is an (easy) fix.
> p.s. The new (beta) WinCVS has some cool mergepoint arrows in the graph
> view now. Neat!
Damn right it is. Oh, sorry, just agreeing with myself. It is *that*
nice :-)
phil
--
change name before "@" to "phil" for email
More information about the cvsnt
mailing list