Re: Problem with cg-merge

From: Sean <seanlkml@sympatico.ca>
Date: May 29, 2005, 16:30 UTC
Message-ID: <3798.10.10.10.24.1117384256.squirrel@linux1>
In-Reply-To: <1117379092.7072.90.camel@pegasus>

On Sun, May 29, 2005 11:04 am, Marcel Holtmann said:

Show 24 quoted lines

> Hi Petr,
>
> I saw that earlier, but I don't have any idea what's wrong here. If I do
> a simple cg-update, I see something like this:
>
> Tree change:
> cf1f29d97210d0594dcf5b2a734bdb714de6bf24:89a14a5bd2c880095d5c618a102319bb3dc03da9
> :100755 100755 ceda2c50fc2c2941daa34a57722df251bf892c38
> fea239b99d351502d1acb098abd725557f0af202 M      cg-diff
> :100755 100755 cc0c17beef75db41da3ad4ef8983bd7e222ac739
> 5f0bff77eb2110d52892793e5bef104acde7be32 M      cg-help
>
> Applying changes...
> Fast-forwarding cf1f29d97210d0594dcf5b2a734bdb714de6bf24 ->
> 89a14a5bd2c880095d5c618a102319bb3dc03da9
>         on top of cf1f29d97210d0594dcf5b2a734bdb714de6bf24...
> patching file cg-diff
> patching file cg-help
> cg-diff: needs update
> cg-help: needs update
>
> This is a little bit odd, because if I call "git-diff-cache HEAD" after
> it, I will see that cg-diff and cg-help are modified. After calling
> cg-cancel everything looks fine again.

Marcel,

Any chance you've installed a copy of git core in addition to your original install of Cogito? That looks like a problem i saw when using a newer git installed overtop of Cogito.

Sean