From: Steffen Prohaska <prohaska@zib.de>
Date: Sat, 23 Jun 2007 13:26:08 GMT
Subject: Re: [PATCH] cvsimport: test case for severe branch import problem
Message-ID: <1BD13366-B4BD-4630-9046-49567A345CBC@zib.de>
In-Reply-To: <11826031071213-git-send-email-prohaska@zib.de>


On Jun 23, 2007, at 2:51 PM, Steffen Prohaska wrote:

> The conclusion is you must not rely on the existing cvsimport for
> tracking cvs branches. The history of such branches may be plain  
> wrong.
> Git may display different patches than cvs would do. Merging cvs
> topic branches may yield completely wrong results. One obvious thing
> that may happen is that a merge reverts changes commited to the cvs
> trunk before the first commit to the cvs branch. And this would happen
> without any indication by git. Everything would seem to run smoothely.

This is not only a theoretical problem but I am experiencing it on a
real-world repository right now. I have a topic branch that branches
off from the wrong commit in git.

Is there an easy way to fix this? I know the right commit the branch
should have as its parent. How can I move it there? git-rebase is not  
the
right command because the patches derived from my branch are already  
wrong.
I would only need to attach the first commit to a different parent.

	Steffen