Re: [HTCondor-devel] Possible corruption in V7_9_3-branch

[Nathan Panike <nwp@xxxxxxxxxxx>]

Looks like another false alarm:

A child of 5b519e2 is bf9d3e83839ace.

git show -s bf9d3e83839ace:

commit bf9d3e83839ace78312dfab5cfb1bb12ff69e2e5
Merge: 760cb43 5b519e2
Author: Dan Bradley <dan@xxxxxxxxxxxx>
Date:   Fri Dec 28 17:12:30 2012 -0600

    Merge branch 'V7_8-branch'

Output of git branch -a --contains bf9d3e83839ace:

  V7_9-queue_analyze
  master
  master-aviary-collector-branch

whereas git branch -a --contains 5b519e2:

  V7_8-branch
  V7_9-queue_analyze
  V7_9_3-branch
  master
  master-aviary-collector-branch

So this looks like a merge that went 7.8 -> master, bypassing 7.9.3.

I thought I had fixed condorbot to handle this case correctly, but it
looks like I have a fix to make.

Sorry for the noise,

Nathan Panike


On Mon, Jan 07, 2013 at 02:24:34PM -0600, htcondorbot wrote:
> Attention HTCondor developers:
> 
> It looks like development code from master may have been pushed into V7_9_3-branch at 5b519e2.
> This should be inspected and---if necessary---corrected as soon as possible.
> 
> First run
> git fetch --all
> 
> 2139c3d is master
> 3ab2573 is new V7_9_3-branch
> ebdc681 is old V7_9_3-branch
> 
> How to reproduce
> 
> For master:
> git rev-list 2139c3d --not ebdc681
> 
> For V7_9_3-branch:
> git rev-list 3ab2573 --not ebdc681
> 
> Notice that 5b519e2 is in both lists, which is not expected.
> 
> The following commands may be useful in resolving this issue:
> 
> gitk 2139c3d 3ab2573 --not ebdc681 
> git --git-dir=/p/condor/repository/CONDOR_SRC.git reflog master@{now}
> git --git-dir=/p/condor/repository/CONDOR_SRC.git reflog V7_9_3-branch@{now}
> 
> Your friendly repository-watching htcondorbot
> _______________________________________________
> HTCondor-devel mailing list
> HTCondor-devel@xxxxxxxxxxx
> https://lists.cs.wisc.edu/mailman/listinfo/htcondor-devel

-- 
Nathan Panike, nwp@xxxxxxxxxxx
UW-Madison Center for High Throughput Computing
Computer Sciences Department, Room 4280
1210 W. Dayton St.
Madison, WI 53706 USA
608.890.0032

Laboratory for Molecular and Computational Genomics
Biotechnology Center
425 Henry Mall, room 5445
Madison, WI 53706 USA
608.890.0086