From: "Sean" <seanlkml@sympatico.ca>
To: "Marcel Holtmann" <marcel@holtmann.org>
Cc: "Petr Baudis" <pasky@ucw.cz>, "GIT Mailing List" <git@vger.kernel.org>
Subject: Re: Problem with cg-merge
Date: Sun, 29 May 2005 12:30:56 -0400 (EDT) [thread overview]
Message-ID: <3798.10.10.10.24.1117384256.squirrel@linux1> (raw)
In-Reply-To: <1117379092.7072.90.camel@pegasus>
On Sun, May 29, 2005 11:04 am, Marcel Holtmann said:
> 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
next prev parent reply other threads:[~2005-05-29 16:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-29 15:04 Problem with cg-merge Marcel Holtmann
2005-05-29 16:30 ` Sean [this message]
2005-05-29 18:17 ` Marcel Holtmann
2005-05-29 18:07 ` Jonas Fonseca
2005-05-29 18:17 ` Marcel Holtmann
2005-05-29 18:48 ` Petr Baudis
2005-05-29 19:48 ` Marcel Holtmann
2005-05-29 21:15 ` Jonas Fonseca
2005-05-29 22:40 ` Petr Baudis
2005-05-29 22:58 ` Jonas Fonseca
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=3798.10.10.10.24.1117384256.squirrel@linux1 \
--to=seanlkml@sympatico.ca \
--cc=git@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=pasky@ucw.cz \
/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).