From: Matt Porter <mporter@kernel.crashing.org>
To: git@vger.kernel.org
Subject: cogito: linux-2.6 merge fails due to cg-rm
Date: Mon, 2 May 2005 10:12:50 -0700 [thread overview]
Message-ID: <20050502101250.A21716@cox.net> (raw)
I guess it was bound to happen after reading rmk's issues. I finally
had a working tree of mine fail to merge from linus' tree while doing
a cg-update. I'm using cogito 0.8. I had to hand merge something
due to DocBook Makefile changes but the real problem was in the
set of files that were removed:
Documentation/DocBook/tulip-user.tmpl
Documentation/DocBook/via-audio.tmpl
arch/um/kernel/sys_call_table.c
drivers/video/intelfb/intelfbdrv.h
scripts/makeman
scripts/split-man
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.
-Matt
--- c3aa1e6b53cc59d5fbe261f3f859584904ae3a63/cg-rm (mode:100755 sha1:029a03128eb7a8dd807335fea2ff52cb2bcda4fa)
+++ uncommitted/cg-rm (mode:100755)
@@ -10,5 +10,5 @@
[ "$1" ] || die "usage: cg-rm FILE..."
-rm -f "$@"
update-cache --remove -- "$@"
+rm -f "$@"
next reply other threads:[~2005-05-02 17:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-02 17:12 Matt Porter [this message]
2005-05-02 17:20 ` cogito: linux-2.6 merge fails due to cg-rm Matt Porter
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=20050502101250.A21716@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).