threads / patch / 4118

patchgit-cvsimport: tiny fix

Subject: [Patch] git-cvsimport: tiny fix

## tl;dr

4 messages between May 10, 2006 and May 18, 2006. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Elrond· May 10, 2006, 17:37 UTC · lore

git-cvsimport: Handle "Removed" from pserver

Sometimes the pserver says "Removed" instead of "Remove-entry".

Signed-off-by: Elrond <elrond+kernel.org@samba-tng.org>
---
Hi,

At least the above happened to me on a repository I tried to convert. Without the patch, it just die("Unknown: Removed ...")s.

    Elrond

--- git-cvsimport.perl +++ git-cvsimport.perl

Show changes to diff +1 −1

@@ -350,7 +350,7 @@ sub _line {
 				return $res;
 			} elsif($line =~ s/^E //) {
 				# print STDERR "S: $line\n";
-			} elsif($line =~ /^Remove-entry /i) {
+			} elsif($line =~ /^(Remove-entry|Removed) /i) {
 				$line = $self->readline(); # filename
 				$line = $self->readline(); # OK
 				chomp $line;

Junio C Hamano· May 17, 2006, 19:12 UTC · re: Elrond · lore

Re: [Patch] git-cvsimport: tiny fix

Elrond <elrond+kernel.org@samba-tng.org> writes:

Show 12 quoted lines

> git-cvsimport: Handle "Removed" from pserver
>
> Sometimes the pserver says "Removed" instead of
> "Remove-entry".
>
> Signed-off-by: Elrond <elrond+kernel.org@samba-tng.org>
> ---
> Hi,
>
> At least the above happened to me on a repository I tried
> to convert.
> Without the patch, it just die("Unknown: Removed ...")s.

Could somebody who actually works with CVS import Ack this? Pretty please?

Martin Langhoff· May 18, 2006, 04:53 UTC · re: Junio C Hamano · lore

Re: [Patch] git-cvsimport: tiny fix

On 5/18/06, Junio C Hamano <junkio@cox.net> wrote:

> Could somebody who actually works with CVS import Ack this?
> Pretty please?

Sounds sane. It would be interesting to hear about what repo (and server) this was seen against. Elrond, can you tell us more about this?

cheers,

martin

Elrond· May 18, 2006, 13:29 UTC · re: Martin Langhoff · lore

Re: [Patch] git-cvsimport: tiny fix

On Thu, May 18, 2006 at 04:53:56PM +1200, Martin Langhoff wrote:

Show 7 quoted lines

> On 5/18/06, Junio C Hamano <junkio@cox.net> wrote:
> >Could somebody who actually works with CVS import Ack this?
> >Pretty please?
> 
> Sounds sane. It would be interesting to hear about what repo (and
> server) this was seen against. Elrond, can you tell us more about
> this?

This is a private local repository. git-cvsimport starts a local "cvs server" for this.

I tried to create a minimal repo, that would trigger the same behaviour, but didn't succeed. My current guessing is, that this happened in cooperation with "cvsps" caching. (cvsps is a tool used by git-cvsimport).

I will move the cvsps cache for my problematic repo out of the way and try a git-cvsimport from scratch to verify that the above mentioned issue is related to cvsps caching. But I still think, that handling all cvs pserver replies should be done anyway in git-cvsimport (when it relies on this mode of operation).

    Elrond