httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@gonzo.ben.algroup.co.uk>
Subject Re: cvs problem
Date Sun, 02 Jun 1996 17:09:44 GMT
Aram Mirzadeh wrote:
> 
> > 
> > Aram Mirzadeh wrote:
> > > 
> > > 
> > > 
> > > Anyone know what this is: 
> > > 
> > > ....
> > > ....
> > > U apache/src/mod_auth_anon.c
> > > RCS file: /export/home/cvs/apache/src/mod_auth_msql.c,v
> > > retrieving revision 1.4
> > > retrieving revision 1.6
> > > Merging differences between 1.4 and 1.6 into mod_auth_msql.c
> > > rcsmerge: warning: conflicts during merge
> > > cvs server: conflicts found in apache/src/mod_auth_msql.c
> > > C apache/src/mod_auth_msql.c
> > 
> > Yes. It means you have made changes to your local copy of mod_auth_msql.c which
> > conflict with changes in the repository. Edit the file and look for >>>>>
or
> > <<<<< which will bracket the conflicting changes. Resolve the conflicts
and
> > then do "cvs update".
> > 
> 
> Doing a cvs update should overwrite any changes that I made correct?  The 
> above was during a cvs update to wipe what I was testing.   <shrug> I'll just
> remove the file and just grab it.  

Whoops. I meant do a "cvs ci". If you want to just lose your changes, then I
guess simply removing the file and doing a "cvs update" would do it, though I
don't think I've ever tried.

Cheers,

Ben.

> 
> Thanks.
> <Aram>
> 
> -- 
> Aram Mirzadeh						awm@qosina.com
> MIS Manager				      Apache httpd team member
> Qosina Corporation				    aram@hyperreal.com
> http://www.qosina.com/			    http://www.qosina.com/~awm
> 
> You're not drunk if you can lie on the floor without holding on.
>                 -- Dean Martin
> 

-- 
Ben Laurie                  Phone: +44 (181) 994 6435
Freelance Consultant and    Fax:   +44 (181) 994 6472
Technical Director          Email: ben@algroup.co.uk
A.L. Digital Ltd,           URL: http://www.algroup.co.uk
London, England.

Mime
View raw message