Re: [PATCH] cvsps/cvsimport: fix branch point calculation and broken branch imports

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On Wed, 2008-04-02 at 12:29 -0700, Junio C Hamano wrote:
> David Mansfield <david@xxxxxxxxxx> writes:
> 
> > In case you're wondering, I'm actually the original author of cvsps,
> > which is behind the scenes for cvsimport.  I don't call myself
> > maintainer because I've hardly been that over the last few years.
> >
> > Anyway, the fix to cvsps is attached (1st 2 patches) as well as the
> > patch to git-cvsimport.perl (2nd 2 patches) against the master branch as
> > of today's git repo.
> >
> > The cvsps patches apply with fuzz against the 2.1 version which is out
> > there.
> 
> When output from an unfixed cvsps is fed to the updated cvsimport, does it
> gracefully do the wrong thing (iow, create the same broken history not too
> much worse than the original)?
> 
> > @@ -826,12 +824,9 @@ while (<CVS>) {
> >  		$branch = $_;
> >  		$state = 5;
> >  	} elsif ($state == 5 and s/^Ancestor branch:\s+//) {
> > -		s/\s+$//;
> > -		$ancestor = $_;
> > -		$ancestor = $opt_o if $ancestor eq "HEAD";
> > +		# now ignored.  see 'Branches' below
> >  		$state = 6;
> >  	} elsif ($state == 5) {
> > -		$ancestor = undef;
> >  		$state = 6;
> >  		redo;
> >  	} elsif ($state == 6 and s/^Tag:\s+//) {
> 

Not currently.  I'm just searching for failure modes for the feature at
the moment (I've already found one myself). 

You're right to point this out though.  Maybe someone can help me write
some tests for this?

Also, how does the git packaging (non-rpm version) specify and/or
guarantee dependencies are at a certain version anyway?

David


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux