From: Jeff King <peff@peff.net>
To: mfwitten@MIT.EDU
Cc: git@vger.kernel.org
Subject: Re: Imports without Tariffs
Date: Fri, 12 Oct 2007 22:49:10 -0400 [thread overview]
Message-ID: <20071013024910.GA26386@coredump.intra.peff.net> (raw)
In-Reply-To: <1C0D32ED-59F7-43D4-88B1-D7A9E754D639@mit.edu>
On Fri, Oct 12, 2007 at 04:36:29PM -0400, mfwitten@MIT.EDU wrote:
> (4) Update my git working tree from CVS (at some later time).
>
> => cd ../work
> => git cvsimport -a -k -v -r cvs -C . module
>
> [PROBLEM]
>
> git-cvsimport creates new hash IDs for the same ol' commits.
>
> [...]
> Therefore, when the updated 'cvs' remote branches are merged into
> my local branches, git treats the commits I made with cvsexportcommit
> as separate history; thus, history is duplicated and merge commits
> appear where they shouldn't.
You are presumably doing a 'git-pull' on the cvsimport-ed commits. Try
doing a git-rebase, which will filter out commits which make the same
changes. Yes, it means throwing away your original commits, but the new
ones should be morally equivalent (and are now the "official" upstream
of the CVS repository).
-Peff
next prev parent reply other threads:[~2007-10-13 2:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-12 20:36 Imports without Tariffs mfwitten
2007-10-13 2:49 ` Jeff King [this message]
[not found] ` <3B7796D6-5901-40B0-B3FC-70642AC50B08@mit.edu>
2007-10-13 4:44 ` Michael Witten
-- strict thread matches above, loose matches on Subject: below --
2007-10-13 4:01 (unknown), Michael Witten
2007-10-13 4:07 ` your mail Jeff King
[not found] ` <1240801C-F4CC-4290-8C3D-2038F1957DF3@MIT.EDU>
2007-10-13 4:39 ` Imports without Tariffs Michael Witten
2007-10-13 7:57 ` Jeff King
2007-10-13 23:04 ` Michael Witten
2007-10-14 16:40 ` Jeff King
2007-10-14 22:10 ` Michael Witten
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071013024910.GA26386@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=mfwitten@MIT.EDU \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).