From: Jakub Narebski <jnareb@gmail•com>
To: Samuel Lucas Vaz de Mello <samuellucas@datacom•ind.br>
Cc: git@vger•kernel.org
Subject: Re: Removing part of the history
Date: Fri, 28 Nov 2008 14:38:22 -0800 (PST) [thread overview]
Message-ID: <m3fxlbjx41.fsf@localhost.localdomain> (raw)
In-Reply-To: <49306150.6010701@datacom.ind.br>
Samuel Lucas Vaz de Mello <samuellucas@datacom•ind.br> writes:
> I have a repository with code imported from CVS.
>
> I first imported from CVS using git 1.5.6 and we started to develop
> in git branches. I run cvsimport periodically and merged the
> changes from CVS (legacy developers) to our git branches. After
> some time, I realized that the import was broken, upgraded to git
> 1.6 and reimported the data. Now the imported data seems to be
> correct and I finished with a history tree like this:
>
> (our branch1) X--Y--Z
> merges> / \
> (our branch2) J--K--L--M--N--O--P
> merges> / / /
> (cvs old) ...A--B--C--D--E /
> merges> /
> (cvs new) ...A'-B'-C'-D'-E'-F'
>
>
> There is any way to get rid of the (broken) cvs-old tree?
>
> I've tried to rebase, but the commits from A' and A are different,
> it tries to reapply all history in CVS.
>
> I've tried to checkout a point before our changes start (B') and
> then, using a script, cherry-pick all commits up to HEAD that are
> not in cvs-old branch. This approach didn't handled well merges
> between our branches (K-L-M and X-Y).
>
> The history from the beginning up to the point where our changes
> started (...A--B) is quite large, so it would be nice for us to get
> rid of it.
>
> Any suggestion on how to handle this?
You can use grafts (see "Repository Layout" documentation) to prune
'cvs old' branches, by adding for each merge commit <c_i> with one
side leading to 'cvs old' branch line to .git/info/grafts
<c_i> <c_i^1>
where <c_i> is full hexadecimal object name.
Then check in gitk or some other history viewer if the history now
looks like you wanted (looks sane).
Then use "git filter-branch --all" to turn grafts into reality, check
out correctness, then remove refs/original/* and do git-gc.
HTH
--
Jakub Narebski
Poland
ShadeHawk on #git
prev parent reply other threads:[~2008-11-28 22:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-28 21:23 Removing part of the history Samuel Lucas Vaz de Mello
2008-11-28 21:34 ` Miklos Vajna
2008-11-28 22:38 ` Jakub Narebski [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=m3fxlbjx41.fsf@localhost.localdomain \
--to=jnareb@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=samuellucas@datacom$(echo .)ind.br \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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