[petsc-dev] Commit collision/corruption?

Satish Balay balay at mcs.anl.gov
Wed Mar 6 17:05:29 CST 2013


On Wed, 6 Mar 2013, Jed Brown wrote:

> On Wed, Mar 6, 2013 at 4:54 PM, Karl Rupp <rupp at mcs.anl.gov> wrote:
> 
> > Hmm, maybe this is just the same commit applied to different branches?
> > (You probably checked
> > https://bitbucket.org/petsc/**petsc-dev/commits/all/<https://bitbucket.org/petsc/petsc-dev/commits/all/>already?)
> > One seems to be applied to the 'yellow branch', the other to the 'blue
> > branch'.
> >
> 
> The color is not significant. Neither commit has a named branch associated
> with it.
> 
> (Hg branches are like labels in the sense that you can have several heads
> that are all part of the same named "branch".)

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.

Satish



More information about the petsc-dev mailing list