[Soc-2005-dev] Pablo, et al: Merging and keywords

[Chris Want]

Hi Pablo,

I just tried a 'psuedo-merge' and didn't get
any conflicts at all, i.e.,

$ cvs -z3 -d:ext:hos at cvs.blender.org:/cvsroot/soc-2005 co -r pdg soc-blender

$ cd soc-blender

$ cvs update -kk -jHEAD:2005-07-23 -jHEAD

Strangely though, it lists new files that were added, but does
not mention that any files were modified ... maybe I'm doing
something wrong?

Chris

Pablo Diaz-Gutierrez wrote:
> Thanks a lot, Chris,
> 
> Still, I keep getting conflicts in files that I haven't touched at all. 
> How bad an idea is it to work all summer without merging with HEAD?