threads / discuss / 439

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

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

## tl;dr

3 messages between May 2, 2005 and May 2, 2005.

replies: 2people: 2as markdown or json

Matt Porter· May 2, 2005, 17:12 UTC · lore

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

Matt Porter· May 2, 2005, 17:20 UTC · re: Matt Porter · lore

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

On Mon, May 02, 2005 at 10:12:50AM -0700, Matt Porter wrote:

Show 7 quoted lines

> 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

Petr Baudis· May 2, 2005, 23:10 UTC · re: Matt Porter · lore

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

Dear diary, on Mon, May 02, 2005 at 07:20:34PM CEST, I got a letter where Matt Porter <mporter@kernel.crashing.org> told me that...

Show 13 quoted lines

> 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.

Oops, this was de facto fixed long time ago (by Junio) but for some reason was not physically merged to my tree. (He already pointed out, but I re-forgot to fix it back then.) update-cache --remove is supposed to remove missing files, so the cg- code is correct.

Should be fixed now. Thanks for pointing it out.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor