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

[Dan Bradley <dan@xxxxxxxxxxxx>]

Looks like a merge from V7_8-branch was just done into V7_9_3-branch.  
Karen, was that a mistake, or is this intended?
The commit in question (5b519e2) was originally checked into V7_8-branch 
and merged directly to master, bypassing V7_9_3-branch. That was my 
understanding of the official merge policy.
--Dan

On 1/7/13 2:24 PM, 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