[Bioc-devel] Git mirror out of sync (LOBSTAHS package)

[Martin Morgan]

On 06/29/2017 11:37 AM, James Collins wrote:
> Hi Martin:
> 
> Thanks — I hadn’t thought of the ‘squash’ strategy before. Will give that a try next time. On a related note: I am concerned that my final commit to the release branch (version number bump to 1.2.1) did not trigger a new release build last night. Could this be related to the same problem I created? Or should I wait another 24 hrs for the build? The final commit with the version change looks like it went in right around the same time (~ 1700 GMT -4) that the package has been building. So maybe I just missed the cutoff.

The top left of the release build landing page

indicates last changed revision 130740. Looking at the svn log

LOBSTAHS$ svn log |head -n4
------------------------------------------------------------------------
r130755 | j.collins | 2017-06-28 17:44:16 -0400 (Wed, 28 Jun 2017) | 1 line

Bump version to release-3.5


or the stamp added to your version bump commit on 
https://github.com/Bioconductor-mirror

git-svn-id: 
https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_3_5/madman/Rpacks/LOBSTAHS@130755 


shows that you were 15 commits too late.

Martin

> 
> Jamie
> 
>> On Jun 29, 2017, at 5:56 AM, Martin Morgan <martin.morgan at roswellpark.org> wrote:
>>
>> Should be back on track; again the problem is with multiple commits to svn in a short time. The solution is I think to do 'squash' commits from your git branch to the devel branch, and then to push the one squash commit rather than n individual commits.
>>
>> Martin
>>
>> On 06/28/2017 05:52 PM, James Collins wrote:
>>> Hi all —
>>> Sorry for the trouble, but the LOBSTAHS Git mirror seems to be out of sync, both on the devel (master) and release-3.5 branches. I pushed a bunch of new commits to devel, and I had to push a few commits to release-3.5 as well to fix a bug identified by a user in the current release version of the package. It looks to me like all the commits made it into their respective svn homes, but somehow not all made it over to the Git mirror.
>>> Thanks in advance.
>>> Respectfully,
>>> Jamie Collins
>>> S
>>> _______________________________________________
>>> Bioc-devel at r-project.org mailing list
>>> https://stat.ethz.ch/mailman/listinfo/bioc-devel
>>
>>
>> This email message may contain legally privileged and/or confidential information.  If you are not the intended recipient(s), or the employee or agent responsible for the delivery of this message to the intended recipient(s), you are hereby notified that any disclosure, copying, distribution, or use of this email message is prohibited.  If you have received this message in error, please notify the sender immediately by e-mail and delete this email message from your computer. Thank you.
> 


This email message may contain legally privileged and/or...{{dropped:2}}