From: Petr Baudis <pasky@suse.cz>
To: Blaisorblade <blaisorblade@yahoo.it>
Cc: git@vger.kernel.org
Subject: Re: [cogito] cg-merge does not remove files removed upstream on fast-forward
Date: Wed, 9 Nov 2005 23:54:09 +0100 [thread overview]
Message-ID: <20051109225409.GH30496@pasky.or.cz> (raw)
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.
prev parent reply other threads:[~2005-11-09 22:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-09 0:08 [cogito] cg-merge does not remove files removed upstream on fast-forward Blaisorblade
2005-11-09 22:54 ` Petr Baudis [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=20051109225409.GH30496@pasky.or.cz \
--to=pasky@suse.cz \
--cc=blaisorblade@yahoo.it \
--cc=git@vger.kernel.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