From: merlyn@stonehenge.com (Randal L. Schwartz)
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org, Matthias Urlichs <smurf@smurf.noris.de>
Subject: Re: git-cvsimport "you may need to merge manually"
Date: 16 Mar 2006 19:41:09 -0800 [thread overview]
Message-ID: <86fylh20x6.fsf@blue.stonehenge.com> (raw)
In-Reply-To: <7vk6at7o06.fsf@assigned-by-dhcp.cox.net>
>>>>> "Junio" == Junio C Hamano <junkio@cox.net> writes:
Junio> Since I know I was just trying things out, I do not care what is
Junio> in my index nor in the working tree files, so I could at this
Junio> point say:
Junio> $ git reset --hard
Junio> to sync the master tree, but in general you may be running
Junio> cvsimport into a dirty tree, in which case you are screwed.
Yeah, this doesn't make sense. It used to "Just Work". I can
certainly add "git reset --hard" to my workflow, if that's the real
work around. And if so, the manpage should document that.
Junio> ... Ugh, and after I wrote all of the above, the version of git
Junio> I have at work predates that commit X-<. So maybe this was
Junio> fixed with that commit, and you are expected to say:
Junio> $ git pull . origin
Junio> assuming that you are on "master" branch and cvsimoprt tracks
Junio> CVS head with "origin" branch, that is.
Again, if that's the case, the manpage should say what's really
happening, so as not to confuse dumb people like me. :)
--
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 3:41 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
2006-03-17 3:04 ` Randal L. Schwartz
2006-03-17 3:23 ` Junio C Hamano
2006-03-17 3:41 ` Randal L. Schwartz [this message]
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=86fylh20x6.fsf@blue.stonehenge.com \
--to=merlyn@stonehenge.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=smurf@smurf.noris.de \
/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