RE: [Squid-cvs] epoll-2_5 squid/src/auth/basic auth_basic.c,1.17.6.8,1.17.6.8.10.1

On Wed, 30 Mar 2005, Steven Wilton wrote:

> I would have thought that if I've manually sync'd the remaining changes
> between the s2_5 branch and the epoll-2_5 branch it would now pick up
> any new changes in the s2_5 branch and only try and merge them.

If cvsmerge is happy then you are fine.

You only need to run cvsmergeinit if cvsmerge is not happy about the
branch tracking somehow.

Regards
Henrik
Received on Tue Mar 29 2005 - 17:23:58 MST