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

[Nils Thuerey]

Hello,

> $ 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?
I think this was the trouble I also had - I ran a similar command for
merging with the 2005-07-19 version, and thought it worked... Later I
noticed that there were only some files added. I basically did a
"cvs update -kk -jHEAD" and resolved the conflicts manually. Maybe it's
because you need more than the changes from 23. up to now? If you
checkout Pablos original version it's missing the updates from before
the 23.? Perhaps something like "-jBLENDER_DIST -jHEAD" would work?

Regards,
-> Nils

> 
> 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?
> 
> _______________________________________________
> Soc-2005-dev mailing list
> Soc-2005-dev at blender.org
> http://projects.blender.org/mailman/listinfo/soc-2005-dev
> 


-- 

. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
.                                                                     .
.          Nils Thuerey                                               .
.          LSS, Inf10 - University of Erlangen Nuremberg              .
.          http://www.ntoken.com                                      .
.          http://www10.informatik.uni-erlangen.de/~sinithue/         .
. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : http://projects.blender.org/pipermail/soc-2005-dev/attachments/20050727/20c5fd33/signature.pgp