home | list info | list archive | date index | thread index

Re: [OCLUG-Tech] dumb cvs question

On Tue, Aug 23, 2005 at 02:58:44PM -0400, Oren Mazor wrote:
> So I just found out that automerge is turned off and I overwrote about 500  
> lines of code another developer added to a project.
> 
> What I, naively, did before was cvs update, and then cvs commit.
> 
> I've fixed everything but it still remains that I was working on 1.18,  
> while somebody upped the file to 1.19. how can I make a 1.20 that will  
> incorporate both?

I think you want "cvs update -j 1.19 file.whatever"

I haven't used CVS in a while though...
mh

> 
> I'm looking for some sort of flag to add to 'cvs update' that will force  
> it to merge the file, instead of just happily putting an M next to it to  
> tell me its modified and then skipping it.
> 
> Thoughts?
> 
> Oren
> 
> PS. yes I know this defeats the entire purpose of CVS.
> 
> -- 
> Oren Mazor // Developer, Sysadmin, Explorer
> GPG Key: http://www.grepthemonkey.org/secure
> "Ut sementem feceris, ita metes"
> _______________________________________________
> Linux mailing list
> Linux [ at ] lists [ dot ] oclug [ dot ] on [ dot ] ca
> http://www.oclug.on.ca/mailman/listinfo/linux

-- 
Martin Hicks || mort [ at ] bork [ dot ] org || PGP/GnuPG: 0x4C7F2BEE

references

message navigation