From: Simon 'corecode' Schubert Date: Mon, 22 Jan 2007 11:08:18 GMT Subject: Re: [PATCH] New files in git weren't being downloaded during CVS update Message-ID: <45B49B22.6050806@fs.ei.tum.de> In-Reply-To: <200701221056.27599.andyparkins@gmail.com> Andy Parkins wrote: > @@ -876,9 +876,9 @@ sub req_update > print "MT newline\n"; > next; > } > - elsif ( !defined($wrev) || $wrev == 0 ) > + elsif ( (!defined($wrev) || $wrev == 0) && (!defined($meta->{revision}) || $meta->{revision} == 0) ) > { > - $log->info("Tell the client the file will be added"); > + $log->info("Tell the client the file is scheduled for addition"); This is nice but probably does not handle a collision (cvs output: file was added by a third party) well and will probably overwrite the locally added file. however it is a step in the right direction. from skimming the code I couldn't find collision handling anyways. cheers simon -- Serve - BSD +++ RENT this banner advert +++ ASCII Ribbon /"\ Work - Mac +++ space for low €€€ NOW!1 +++ Campaign \ / Party Enjoy Relax | http://dragonflybsd.org Against HTML \ Dude 2c 2 the max ! http://golden-apple.biz Mail + News / \