From: Petr Baudis <pasky@suse.cz>
Date: Wed, 09 Nov 2005 22:54:09 GMT
Subject: Re: [cogito] cg-merge does not remove files removed upstream on fast-forward
Message-ID: <20051109225409.GH30496@pasky.or.cz>
In-Reply-To: <200511090108.51776.blaisorblade@yahoo.it>

Dear diary, on Wed, Nov 09, 2005 at 01:08:33AM CET, I got a letter
where Blaisorblade <blaisorblade@yahoo.it> said that...
> Once again, (not the first time) when doing "cg-merge origin" (or cg-update I 
> guess, too) I find a tons of files which were removed upstream and cogito 
> didn't remove. It was a fast-forward merge on Linus' tree:
> 
> $ cg merge origin
> Fast-forwarding d83c671fb7023f69a9582e622d01525054f23b66 -> 
> a52e8381c430896d3bd6065a34fda99cb5c74c82
>         on top of d83c671fb7023f69a9582e622d01525054f23b66...

Strange. I've just added a test against this, and it seems to work fine
for me. Hmm.

Could you please test any post-1936f62c0756d8051bd3a8ee4214e058f168d395
Cogito version?

Thanks,

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.