[petsc-dev] Commit collision/corruption?

Jed Brown jedbrown at mcs.anl.gov
Wed Mar 6 17:15:27 CST 2013


On Wed, Mar 6, 2013 at 5:05 PM, Satish Balay <balay at mcs.anl.gov> wrote:

> The empty 'diffs' is interesting. It happens with 'rebase of a merge'
> [for some hg versions or all hg version?]  But then this is a merge
> commit [not a rebase commit]. And then Barry doesn't use rebase..
>
> So my suspession is - BitBucket doing someting funky for a commit that
> got pushed via 2 diffrent routes.
>

Bitbucket cannot rewrite SHA1s. It was the hg running on Barry's machine
that made the funky commit.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20130306/8de81a16/attachment.html>


More information about the petsc-dev mailing list