Git development
 help / color / mirror / Atom feed
From: David Mansfield <david@cobite.com>
To: Martin Mares <mj@ucw.cz>
Cc: git@vger.kernel.org, CVSps@dm.cobite.com
Subject: Re: git-cvs-import and branches
Date: Fri, 17 Feb 2006 15:35:15 -0500	[thread overview]
Message-ID: <1140208515.3397.177.camel@gandalf.cobite.com> (raw)
In-Reply-To: <mj+md-20060217.193815.10412.albireo@ucw.cz>

On Fri, 2006-02-17 at 20:55 +0100, Martin Mares wrote:
> Hello!
> 
> I'm git-importing a rather large CVS repository with lots of branches and
> although the mainline is imported correctly, the branches aren't. They
> usually contain some changes introduced to the ancestor branch after
> the point the new branch has been tagged.
> 
> I haven't studied git-cvsimport and cvsps in much detail yet, but it seems
> that git-cvsimport forks off the branch at the first patchset reported by
> cvsps which mentions the branch and copies the current state of the ancestor
> branch at that time.
> 
> This doesn't seem to be correct, since many changes might have happened
> to the ancestor branch since the real branching point. However, since
> cvsps doesn't report the branching points (and they aren't exact points anyway
> since tagging is not atomic in CVS), I don't see how to make cvsimport
> find the right starting revision.

Ugh.  I understand the problem but really don't have any solutions
off-hand.  Unfortunately, I dying under a 'real work' load at the
moment, so I have to apologize and say, 'good luck.'


David

      reply	other threads:[~2006-02-17 20:35 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-17 19:55 git-cvs-import and branches Martin Mares
2006-02-17 20:35 ` David Mansfield [this message]

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=1140208515.3397.177.camel@gandalf.cobite.com \
    --to=david@cobite.com \
    --cc=CVSps@dm.cobite.com \
    --cc=git@vger.kernel.org \
    --cc=mj@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