Git development
 help / color / mirror / Atom feed
From: Hannu Koivisto <azure@iki.fi>
To: git@vger.kernel.org
Subject: git-cvsimport doesn't support the default branch mechanism?
Date: Wed, 27 Dec 2006 23:03:15 +0200	[thread overview]
Message-ID: <874prhvyp8.fsf@trews52.bothi.fi> (raw)

Greetings,

I tried to git-cvsimport an existing project but there seemed to be
something wrong with the result.  On closer inspection I noticed
that contents of files that had never been modified in trunk
corresponded to revision 1.1 instead of the tip of the vendor
branch in the generated master and origin branches.

In other words (using zsh):

> mkdir test
> cd test
> mkdir repo
> export CVSROOT=`pwd`/repo
> cvs init
> mkdir foo
> cd foo
> echo lahna > kala.txt
> cvs import -m "Initial vendor import." foo vendor vendor-v1
> cd ..
> rm -r foo
> cvs co foo
> cd foo
> cvs up -rvendor
> echo hauki >! kala.txt
> cvs commit -m "Fake 2nd. vendor import."
> cvs up -A
> cat kala.txt
hauki
> cd ..
> git-cvsimport -d $CVSROOT -C foo.git foo
> cd foo.git
> git-checkout -f master
> cat kala.txt
lahna

I would have expected to get "hauki" from that last "cat kala.txt"
as well.  Is this a known problem or a feature?  In either case, how
should I work around it?

-- 
Hannu

                 reply	other threads:[~2006-12-27 21:03 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=874prhvyp8.fsf@trews52.bothi.fi \
    --to=azure@iki.fi \
    --cc=git@vger.kernel.org \
    /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