From: Matt Porter <mporter@kernel.crashing.org>
To: git@vger.kernel.org
Subject: Re: cogito: linux-2.6 merge fails due to cg-rm
Date: Mon, 2 May 2005 10:20:34 -0700 [thread overview]
Message-ID: <20050502102034.B21716@cox.net> (raw)
In-Reply-To: <20050502101250.A21716@cox.net>; from mporter@kernel.crashing.org on Mon, May 02, 2005 at 10:12:50AM -0700
On Mon, May 02, 2005 at 10:12:50AM -0700, Matt Porter wrote:
> These kept showing up as "needs merged" even though I explicitly
> tried to cg-rm them or "update-cache --remove" them. It turns out
> that cg-rm is 'rm -f'ing the files before calling update-cache.
> By touching each file, and then modifying cg-rm as follows, I
> was able to complete the merge. I'm not sure yet if this is the
> proper fix to the cogito script. It at least made update-cache
> happy for this remove case.
Looking a bit further, I see the cg-Xmergefile also removes the
file before update-cache --remove which doesn't seem to work. This
seems to be the actual culprit during the merge, but cg-rm needed
fixed to manually fix without calling git commands directly.
-Matt
next prev parent reply other threads:[~2005-05-02 17:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-02 17:12 cogito: linux-2.6 merge fails due to cg-rm Matt Porter
2005-05-02 17:20 ` Matt Porter [this message]
2005-05-02 23:10 ` Petr Baudis
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=20050502102034.B21716@cox.net \
--to=mporter@kernel.crashing.org \
--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 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.