cogito: linux-2.6 merge fails due to cg-rm

[Matt Porter <mporter@kernel.crashing.org>]

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 "$@"