All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nick Woolley <nickwoolley@yahoo.co.uk>
To: Mike Ralphson <mike.ralphson@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
	Robin Rosenberg <robin.rosenberg.lists@dewire.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Jeff King <peff@peff.net>,
	git@vger.kernel.org
Subject: Re: [PATCH] git-cvsexportcommit can't commit files which have been removed from CVS
Date: Mon, 06 Jul 2009 14:23:31 +0100	[thread overview]
Message-ID: <4A51FAD3.7010306@yahoo.co.uk> (raw)
In-Reply-To: <e2b179460907020650u672d8724p45f67173668332aa@mail.gmail.com>

Mike Ralphson wrote:
> debug.out contains the following:
> 
> # before adding file
> cvs status: nothing known about attic_gremlin
> ===================================================================
> File: no file attic_gremlin             Status: Unknown
> 
>    Working revision:    No entry for attic_gremlin
>    Repository revision: No revision control file
> 
> ===================================================================
> File:  space            Status: Needs Patch

This is what I get on this line:

  File:  space           	Status: Up-to-date

Which might explain why it fails the 'up to date check' in your case - it seems
that CVS hasn't synchronised the " space" file with the respository?  Or is this
an artifact created by the race condition Robin mentioned?  I gather the problem
appears intermittently.


> 
> CVS/Entries for the file has
> / space/1.1/Thu Jul  2 12:50:17 2009//
> 
>> You might also try commenting out the following part of my test, so that it
>> should trivially work, and see if there's still an error:
>>
>> #      rm attic_gremlin &&
>> #      cvs -Q rm attic_gremlin &&
>> #      cvs -Q ci -m "removed attic_gremlin"
> 
> It all goes a bit fun if I do that...
> 

Actually, I get the error you do here - my mistake, I should have told you to
comment out the whole clause, i.e.:

#     (cd "$CVSWORK" &&
#      echo >attic_gremlin &&
#      cvs -Q add attic_gremlin &&
#      cvs -Q ci -m "added attic_gremlin" &&
#      rm attic_gremlin &&
#      cvs -Q rm attic_gremlin &&
#      cvs -Q ci -m "removed attic_gremlin") &&

I've checked this passes for me.


> Would it be acceptable to simply reorder the tests so this previously
> unreported error goes away again?

Speaking personally, I can't see why not, although I don't understand the
mechanism of the race condition in question. Wouldn't a race condition like this
potentially cause similar errors to crop up all through the test script,
whenever git-cvsexportingcommit gets a bogus "Needs Patch" status?

An alternative might be to start my particular test by creating a new CVS
repository.


Cheers,

N

ps I've patched git-cvsexportcommit.perl to get rid of the warnings I can also
see in your output, and will submit those to this list separately.

      reply	other threads:[~2009-07-06 13:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-28 23:23 [PATCH] git-cvsexportcommit can't commit files which have been removed from CVS Nick Woolley
2009-06-10  8:06 ` Mike Ralphson
2009-06-11 14:10   ` Nick Woolley
2009-06-11 15:45     ` Junio C Hamano
2009-06-11 15:49     ` Junio C Hamano
2009-06-11 17:04       ` Junio C Hamano
2009-06-12  6:59         ` Robin Rosenberg
2009-07-02 13:50     ` Mike Ralphson
2009-07-06 13:23       ` Nick Woolley [this message]

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=4A51FAD3.7010306@yahoo.co.uk \
    --to=nickwoolley@yahoo.co.uk \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mike.ralphson@gmail.com \
    --cc=peff@peff.net \
    --cc=robin.rosenberg.lists@dewire.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.