Re: Git out of sync vs. CVS

2010/1/17 Tom Lane <tgl@sss.pgh.pa.us>:
> Magnus Hagander <magnus@hagander.net> writes:
>> 2010/1/17 Peter Eisentraut <peter_e@gmx.net>:
>>> Maybe I'm hallucinating and someone could check this in their
>>> environment, but it appears to me that the Git repository is missing
>>> parts of two non-recent commits.  See attached patch.
>
>> Not having looked at the repo in detail, but I bet this happened
>> because the git mirror grabbed it's snapshot in the middle of a cvs
>> commit with multiple files. Since cvs doesn't have atomic commits, I
>> think that kind of thing can happen.
>
> That would explain a single CVS commit appearing as two separate commits
> in the git history; but it hardly seems like an acceptable excuse for
> missing changes altogether, which is what I think Peter said he saw.

It's likely the combination of that, and the cvs to git sync script
not considering that this can happen. So when it does the second pass
(once it's all been synced) it detects it as a single commit, and
doesn't re-import it.

We've seen this happen before.


-- Magnus HaganderMe: http://www.hagander.net/Work: http://www.redpill-linpro.com/