From: Chris Shoemaker <c.shoemaker@cox.net>
To: Yann Dirson <ydirson@altern.org>
Cc: GIT list <git@vger.kernel.org>, cvsps@dm.cobite.com
Subject: Re: [PATCH] CVSps fixed; git-cvsimport works, too
Date: Sat, 17 Jun 2006 10:34:43 -0400 [thread overview]
Message-ID: <20060617143443.GA29602@pe.Belkin> (raw)
In-Reply-To: <20060617134717.GR7766@nowhere.earth>
On Sat, Jun 17, 2006 at 03:47:17PM +0200, Yann Dirson wrote:
> 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.
>
> > 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
>
> 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/>
next prev parent reply other threads:[~2006-06-17 14:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-17 12:21 [PATCH] CVSps fixed; git-cvsimport works, too Yann Dirson
2006-06-17 13:20 ` Chris Shoemaker
2006-06-17 13:47 ` Yann Dirson
2006-06-17 14:34 ` Chris Shoemaker [this message]
2006-06-17 18:51 ` Yann Dirson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060617143443.GA29602@pe.Belkin \
--to=c.shoemaker@cox.net \
--cc=cvsps@dm.cobite.com \
--cc=git@vger.kernel.org \
--cc=ydirson@altern.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).