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

[Dan Bradley <dan@xxxxxxxxxxxx>]

Hi Karen,

The developer wiki says that in some cases we should ask the release 
wrangler whether to merge bug fixes into a release branch.  In some 
cases, the wrangler says no.  Is that a problem, given the procedures 
used for merging the docs?  I thought we had a solution for merging docs 
without merging code, but I don't recall if it was actually implemented 
or if it turned out to be flawed in some way.
--Dan

On 11/26/12 1:09 PM, Karen Miller wrote:
> From Nathan, but not sent to the group.  Just thought y'all
> would want to know that there is not a problem with the repo.
> Karen
>
>
> On 11/26/2012 12:49 PM, Nathan Panike wrote:
> > It is a false positive
> >
> > Problem is caused by not merging 7.8 ->  7.9.2 ->  master consistently.
> >
> > 55a70d4a321 is on 7.8 and got merged 7.8 ->  master.
> >
> > Then Karen came along and merged 7.8 ->  7.9.2 ->  master.
> >
> > The result is that 55a70d4a321 is on master, before it is on 7.9.2; this
> > caused htcondorbot to think there is corruption.
> >
> > I will fix this code so this false alarm does not happen again.
> >
> > Nathan Panike
> >
> > On Mon, Nov 26, 2012 at 11:55:12AM -0600, Todd Tannenbaum wrote:
> > > -------- Original Message --------
> > > Subject: [HTCondor-devel] Possible corruption in V7_9_2-branch
> > > Date: Mon, 26 Nov 2012 11:36:38 -0600
> > > From: htcondorbot<nwp@xxxxxxxxxxx>
> > > To: htcondor-devel@xxxxxxxxxxx
> > >
> > > Attention HTCondor developers:
> > >
> > > It looks like development code from master may have been pushed into
> > > V7_9_2-branch at 06095c4.
> > > This should be inspected and---if necessary---corrected as soon as 
> > > possible.
> > > First run
> > > git fetch --all
> > >
> > > 4b7252b is master
> > > 5f44f22 is new V7_9_2-branch
> > > 0a43668 is old V7_9_2-branch
> > >
> > > How to reproduce
> > >
> > > For master:
> > > git rev-list 4b7252b --not 0a43668
> > >
> > > For V7_9_2-branch:
> > > git rev-list 5f44f22 --not 0a43668
> > >
> > > Notice that 06095c4 is in both lists, which is not expected.
> > >
> > > The following commands may be useful in resolving this issue:
> > >
> > > gitk 4b7252b 5f44f22 --not 0a43668
> > > git --git-dir=/p/condor/repository/CONDOR_SRC.git reflog master@{now}
> > > git --git-dir=/p/condor/repository/CONDOR_SRC.git V7_9_2-branch@{now}
> > >
> > > Your friendly repository-watching htcondorbot
> > > _______________________________________________
> > > HTCondor-devel mailing list
> > > HTCondor-devel@xxxxxxxxxxx
> > > https://lists.cs.wisc.edu/mailman/listinfo/htcondor-devel
> _______________________________________________
> HTCondor-devel mailing list
> HTCondor-devel@xxxxxxxxxxx
> https://lists.cs.wisc.edu/mailman/listinfo/htcondor-devel