From: merlyn@stonehenge.com (Randal L. Schwartz)
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: git-cvsimport "you may need to merge manually"
Date: 16 Mar 2006 18:57:08 -0800 [thread overview]
Message-ID: <86r75122yj.fsf@blue.stonehenge.com> (raw)
In-Reply-To: <7vu09x7puo.fsf@assigned-by-dhcp.cox.net>
>>>>> "Junio" == Junio C Hamano <junkio@cox.net> writes:
>> Right... why didn't it commit those? I'm having to issue "fake"
>> commits now, so I've lost the cvs-log comments that were formerly
>> very complete and cool.
Junio> I do not use cvsimport but I wonder what Commit ID 985ca7
Junio> contains. Can you try "git show 985ca7" and see if that is the
Junio> commit you want?
To bring the tree clean, I issued "git commit -a -m 'cvs sync'", and
"git-whatchanged -p" shows the most recent commit with the diff actually
*backed out* the most recent change in CVS, and the next change down was
actually the good one. Weird. Do I need to start all over again?
Junio> Also, which branch are you on when you run git-cvsimport, and
Junio> which branch did the commit 985ca7 go? I suspect it is storing
Junio> the tip commit 985ca7 to a branch that you are _not_ on
Junio> currently, but refraining from merging that to your current
Junio> branch, or something like that.
Nope. I'm on "master", and it should be writing "master".
--
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!
next prev parent reply other threads:[~2006-03-17 2:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-17 2:37 git-cvsimport "you may need to merge manually" Randal L. Schwartz
2006-03-17 2:43 ` Junio C Hamano
2006-03-17 2:57 ` Randal L. Schwartz [this message]
2006-03-17 3:04 ` Randal L. Schwartz
2006-03-17 3:23 ` Junio C Hamano
2006-03-17 3:41 ` Randal L. Schwartz
2006-03-17 4:16 ` Junio C Hamano
2006-03-17 4:19 ` Randal L. Schwartz
2006-03-18 23:21 ` Junio C Hamano
2006-03-17 7:26 ` smurf
2006-03-17 8:08 ` Junio C Hamano
2006-03-17 6:46 ` smurf
2006-03-17 8:06 ` Junio C Hamano
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=86r75122yj.fsf@blue.stonehenge.com \
--to=merlyn@stonehenge.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.