From: Yann Dirson Date: Sat, 17 Jun 2006 13:47:17 GMT Subject: Re: [PATCH] CVSps fixed; git-cvsimport works, too Message-ID: <20060617134717.GR7766@nowhere.earth> In-Reply-To: <20060617132023.GA29452@pe.Belkin> On Sat, Jun 17, 2006 at 09:20:23AM -0400, Chris Shoemaker wrote: > > > > * when run with "-A" cvsps notices the inconsistency: > > > > invalid initial_branch for file a, probably from old cache, run with -x. > > good advice. > > > > > > > I have included the current version of your patch in branch "to-check" > > in http://ydirson.free.fr/soft/git/cvsps.git/. I did not tak time to > > look at it closely yet - do you plan to work on this issue ? > > I wondered if you'd find that. Evidentally, you're being thorough. :) > > The intent of my patch is only to affect the branch ancestry > calculation. IIRC, the patch version is incompatible with cached > results from unpatched versions. Hence I would only expect it to work > with '-x -A' (unless there was no pre-existing cache file). All those tests were done with your patch applied, so the cache was generated and re-read using the pached version. > There's probably some nicer way to handle the cache incompatibility, > but my current approach has been to tell people to delete their old > cache file or run wih -x. Suggestions are welcome. If the cache format is changed, this would be a good candidate for the "v2" cache format. I already have 2 (incomplete) patches that well need to bump the cache format version - see branches multitag (allow several tags per patchset) and semicolon (allow semicolons in filenames). Best regards, -- Yann Dirson | Debian-related: | Support Debian GNU/Linux: | Freedom, Power, Stability, Gratis http://ydirson.free.fr/ | Check