Re: [PATCH] CVSps fixed; git-cvsimport works, too

From: Chris Shoemaker <c.shoemaker@cox.net>
Date: Jun 17, 2006, 14:34 UTC
Message-ID: <20060617143443.GA29602@pe.Belkin>
In-Reply-To: <20060617134717.GR7766@nowhere.earth>

On Sat, Jun 17, 2006 at 03:47:17PM +0200, Yann Dirson wrote:

Show 23 quoted lines

> 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.

Are you saying there was no pre-existing cache file when the patched version was first run? Did you delete it? If so, then there's a bug somewhere.

Show 10 quoted lines

> 
> > 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).

IIRC, it's not syntactically incompatible - it's just that the patched version can tell that it doesn't trust the initial branch determinations that are stored in the cache file by an unpatched version.

The complaint is basically, Hey, there's an initial branch determination already made for this file, but it's not the one I would have made, so it must have been restored from a cache file that I didn't make.

-chris

Show 7 quoted lines

> 
> Best regards,
> -- 
> Yann Dirson    <ydirson@altern.org> |
> Debian-related: <dirson@debian.org> |   Support Debian GNU/Linux:
>                                     |  Freedom, Power, Stability, Gratis
>      http://ydirson.free.fr/        | Check <http://www.debian.org/>