Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Repo info
Activity
  • May 08 20:59
    mloskot milestoned #606
  • May 08 20:59
    mloskot labeled #606
  • May 08 20:59
    mloskot labeled #606
  • May 08 20:59
    mloskot opened #606
  • May 08 20:57
    mloskot commented #453
  • May 08 08:25
    Build #185 passed
  • May 08 07:33
    Sayan-Chaudhuri review_requested #604
  • May 08 07:31
    Sayan-Chaudhuri synchronize #604
  • May 08 07:31
    Sayan-Chaudhuri synchronize #604
  • May 08 07:28
    Sayan-Chaudhuri synchronize #604
  • May 07 08:11
    mloskot commented #599
  • May 07 08:09
    mloskot commented #599
  • May 07 05:54
    sdebionne commented #453
  • May 07 02:08
    lpranam commented #599
  • May 06 23:43
    mloskot edited #599
  • May 06 23:41
    mloskot commented #596
  • May 06 23:40
    mloskot commented #596
  • May 06 23:39
    mloskot commented #596
  • May 06 23:34
    mloskot synchronize #596
  • May 06 23:23
    mloskot commented #596
Olzhas Zhumabek
@simmplecoder
yeah, the likelihood of tests not passing is going down every minute. I don't think I will be able to respond rapidly in the following 5 or so days though, so hopefully I will be able to deal with all problems today
Mateusz Łoskot
@mloskot
No problem. You have different priorities now
Mateusz Łoskot
@mloskot
Olzhas Zhumabek
@simmplecoder
@mloskot, one of the builds broke due to some changes in the OS or something similar, I think
Mateusz Łoskot
@mloskot
Restarting the job. If does not help, we will ignore it.
Olzhas Zhumabek
@simmplecoder
great, seems like it worked. Thanks!
Mateusz Łoskot
@mloskot
Awesome!
I will keep nudging @stefanseefeld :-)
Olzhas Zhumabek
@simmplecoder
merged, thanks @stefanseefeld !
Mateusz Łoskot
@mloskot
@simmplecoder Do you mind if I run apply some of the corrections/changes I suggested in my review?
Stefan Seefeld
@stefanseefeld
OK, so I could merge to master now ?
Olzhas Zhumabek
@simmplecoder
@mloskot , sure, if we've got time
Stefan Seefeld
@stefanseefeld
Oh, OK, I'll wait a little longer, then.
:-)
Mateusz Łoskot
@mloskot
It's not critical for release, I can do it after merge, for example https://github.com/boostorg/gil/pull/392#discussion_r338236303
Stefan Seefeld
@stefanseefeld
I'll merge no later than tonight (EST)
Mateusz Łoskot
@mloskot
I'm also a bit :confused: about the length namin https://github.com/boostorg/gil/pull/392#discussion_r338234886
Stefan Seefeld
@stefanseefeld
Either is fine. If you expect to do this in the next couple of hours I can wait. Otherwise we can do it later and merge as "minor changes and improvements" :-)
Mateusz Łoskot
@mloskot
Finally, it would be nice to stick in some asserts https://github.com/boostorg/gil/pull/392#discussion_r338237322
@stefanseefeld Let's merge it now
Stefan Seefeld
@stefanseefeld
OK, fair enough. Let me do it while I'm looking at it...
Mateusz Łoskot
@mloskot
We better give ourselves time for master CI
Olzhas Zhumabek
@simmplecoder
I'm a bit tired for today, did a lab and two reading reports. If the deadline is on Monday, I can incorporate the changes on weekends
Mateusz Łoskot
@mloskot
@simmplecoder Please, don't bother. You should go offline long time ago!
Olzhas Zhumabek
@simmplecoder
ok, thanks! good luck with the merge :)
Mateusz Łoskot
@mloskot
There will be no requests for you. If there is anything to tweak, I/we will do it
@stefanseefeld My comments were minor "nice to have" things.
Since the Travis CI queue may take time, we better merge sooner and see if our master builds fine
Stefan Seefeld
@stefanseefeld
Er, now I'm confused: I just updated both master and develop, then I tried to merge develop into master, but I get merge conflicts. How is that possible ?
Mateusz Łoskot
@mloskot
Where is the conflict?
I'm trying myself
Stefan Seefeld
@stefanseefeld
a whole lot ! mostly build logic, i.e. Jamfiles, CMakeLists.txt files, but also some json.
Mateusz Łoskot
@mloskot
Yes, I see them. This is weird as I did try the merge some weeks testing the emergency fix for our docs and it was fine
Stefan Seefeld
@stefanseefeld
right, so you cherry-picked. I didn't expect this to cause merge-conflicts down the line, though. Hmm.
Mateusz Łoskot
@mloskot
me neither
I'm looking what's wrong
Stefan Seefeld
@stefanseefeld
thanks
Mateusz Łoskot
@mloskot
@stefanseefeld you there?
Stefan Seefeld
@stefanseefeld
yes
(but I'm about to join a conference call, so not very responsive for the next hour or so)
Mateusz Łoskot
@mloskot
I think I managed to merge and resolve the conflicts automatically with 4-5 manual interventions, I will copy bunch of commands that I used here in a few minutes
I will be leaving in an hour for training session, then I will be online late tonight
Mateusz Łoskot
@mloskot

@stefanseefeld Here is the grand merging develop to master for Boost 1.72 and resolving conflicts

# First, let git merge preferring changes in develop
$ git merge -s recursive -X theirs develop

# Second, merge status will still report some unmerged paths
Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
        deleted by them: .ci/build-and-test.sh
        both deleted:    io/test_images/jpg/EddDawson/36dpi.jpg
        both deleted:    io/test_images/jpg/test.jpg
        added by them:   test/extension/io/images/jpeg/EddDawson/36dpi.jpg
        added by them:   test/extension/io/images/jpeg/test.jpg
        added by us:     test/extension/io/images/jpg/EddDawson/36dpi.jpg
        added by us:     test/extension/io/images/jpg/test.jpg
        added by us:     test/extension/io/images/png/grayalpha-with-tRNS-chunk.png
        added by us:     test/extension/io/images/pnm/readme.txt
        added by us:     test/extension/toolbox/CMakeLists.txt

# Third, resolve the unmerged paths manually
$ git rm -r test/extension/io/images/jpg
$ git add test/extension/io/images/jpeg/
$ git add .ci
$ git rm -r io/test_images/jpg
$ git add test/extension/io/images/png/grayalpha-with-tRNS-chunk.png
$ git add test/extension/io/images/pnm/readme.txt
$ git add test/extension/toolbox/CMakeLists.txt

# Finally, complete the merge
$ git merge --editor --continue

I suggest to update the merge commit message and mention Boost release version, like so:

Merge branch 'develop' for Boost 1.72 release
I hope this is all right. But, if master gets broken somehow , we will simply re-create it from develop as we did during previous grand merge. What the hell :-)
Mateusz Łoskot
@mloskot
@stefanseefeld It may be useful to have the procedure properly archived for future references, so I've copied it here https://lists.boost.org/boost-gil/2019/10/0335.php
Stefan Seefeld
@stefanseefeld
@mloskot still here ? I have followed your above recipe (thank you very much for the detailed description !), and am ready to push, but our current commit policies prevent me from doing that.
I suppose I could just deactivate them temporarily, but wanted to coordinate with you.
Mateusz Łoskot
@mloskot
Hi @stefanseefeld I'm back and will be here for half an hour or so
Yes, you can deactivate but that is quite interseting why you can not push. I recall our GitHub's settings for our master branch should only prevent force-push
Mateusz Łoskot
@mloskot
@stefanseefeld I've reviewed the master branch protection settings and CI status checks where ticked as required - probably that prevented your merges. I ticked those off. Now only force-push to master is forbidden.
Stefan Seefeld
@stefanseefeld
ok, let me do that, then.