[cogito] cg-merge does not remove files removed upstream on fast-forward

Blaisorblade· Nov 9, 2005, 00:08 UTC · lore

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

cg version cogito-0.15.1 (b07f98ba4cabdd9d208da28be932e547675e5cdf) (The base id is ab91bd11258f8987fc8d537871c733e04f8c8248, I've added a trivial patch to add more options to cg-diff and cg-mkpatch, i.e. unrelated).

Below there is the excerpt of code in tree_timewarp:

       # Kill gone files
        git-diff-tree -z -r $base $branch | xargs -0 bash -c '
                while [ "$1" ]; do
                        header="$1"; shift
                        file="$1"; shift

                        # match ":100755 000000 14d43b1abf... 000000000... D"
                        if echo "$header" | egrep "^:([^ ][^ ]* ){4}D"

>/dev/null; then

                                rm -- "$file"
                        fi
                done
        ' padding

I must say I also saw git-ls-files --deleted running with top (probably from cg-patch), but it didn't seem to help.

-- 
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

		
___________________________________ 
Yahoo! Messenger: chiamate gratuite in tutto il mondo 
http://it.messenger.yahoo.com

Petr Baudis· Nov 9, 2005, 22:54 UTC · re: Blaisorblade · lore

Re: [cogito] cg-merge does not remove files removed upstream on fast-forward

Dear diary, on Wed, Nov 09, 2005 at 01:08:33AM CET, I got a letter where Blaisorblade <blaisorblade@yahoo.it> said that...

Show 8 quoted lines

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