Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Repo info
Activity
  • Nov 18 06:58
    dkastl closed #2218
  • Nov 18 06:58
    dkastl commented #2218
  • Nov 18 03:47

    github-actions[bot] on gh-pages

    Update users documentation for … (compare)

  • Nov 18 03:43

    cvvergara on develop

    Organize pgtap tests (#2217) *… (compare)

  • Nov 18 03:43
    cvvergara closed #2217
  • Nov 18 03:31
    wmabcde opened #2218
  • Nov 18 03:03
    cvvergara assigned #2217
  • Nov 18 03:00
    cvvergara synchronize #2217
  • Nov 17 20:01
    cvvergara edited #2217
  • Nov 17 20:01
    cvvergara review_requested #2217
  • Nov 17 20:01
    cvvergara review_requested #2217
  • Nov 17 20:01
    cvvergara review_requested #2217
  • Nov 17 20:01
    cvvergara review_requested #2217
  • Nov 17 20:01
    cvvergara review_requested #2217
  • Nov 17 20:01
    cvvergara review_requested #2217
  • Nov 17 20:01
    cvvergara milestoned #2217
  • Nov 17 20:01
    cvvergara labeled #2217
  • Nov 17 20:01
    cvvergara opened #2217
  • Nov 16 18:10

    cvvergara on gh-pages

    Adjusting index file and symlin… (compare)

  • Nov 16 18:02

    github-actions[bot] on gh-pages

    Update users documentation for … (compare)

Mohamed Bakli
@mbakli
Done
Vicky Vergara
@cvvergara
Now we are going to regenerate the NEWS file that is at the root of the repository with this command from the root of the repo:
tools/release-scripts/notes2news.pl
if you do a git status you should see that the file NEWS changed
Mohamed Bakli
@mbakli
Done
Vicky Vergara
@cvvergara
ok, so now lets wait until the pendnig CI finish
Mohamed Bakli
@mbakli
OK, thanks
Vicky Vergara
@cvvergara
or
lets work on another branch
I am thinking
we will work on another branch
git checkout -b interruptions
Mohamed Bakli
@mbakli
OK, I did.
Vicky Vergara
@cvvergara
we are going to squash all the commits into one commit
for that purpose:
git remote add upstream https://github.com/pgRouting/pgrouting
git fetch upstream
to check that you have upstream pointing to pgRouting main repo:
git remote -v
To squash the commits I will tell you the command and what happens. then after that information you do it
git rebase -i upstream/master
That will open a file, and it has some instructions in form of comments that start with #
Mohamed Bakli
@mbakli
Yes I see
Vicky Vergara
@cvvergara
one of the instructions is
# s, squash = use commit, but meld into previous commit
you need to change the pick to squash in all the commits except the first one
Mohamed Bakli
@mbakli
Should I uncomment this line?
OK
Vicky Vergara
@cvvergara
when you save & close the file it will start applying the commits and things an happen:
  • a conflict (which I doubt) if this happens tell me
    and it will open another file where you are going to edit the commit message of the squashed commits
Mohamed Bakli
@mbakli
You mean change this line : # p, pick = use commit to # p, squash = use commit
Vicky Vergara
@cvvergara
Everything that is commented is ignored, so, no, dont uncomment, we dont need instructions on how to use git rebase in the text of the commit
pick 3f5a7a3cc Check interruption in include/dijkstra
squash c1e8d07cd Check interruption in include/dijkstra
squash f67c53d5a Check interruption in include/allpairs
...
Leave the instructions just as they are as comments
when the second file opens then you can make a larger commit message
Mohamed Bakli
@mbakli
To check if I understand well or not, I will only open the first file without changes, right?
Vicky Vergara
@cvvergara
you need to change the comands from pick to squash as in this example
pick 3f5a7a3cc Check interruption in include/dijkstra
squash c1e8d07cd Check interruption in include/dijkstra
squash f67c53d5a Check interruption in include/allpairs
...
Mohamed Bakli
@mbakli
Ok, I understood.
Vicky Vergara
@cvvergara
and leave the instructions on how to use git rebase intact (aka things that have comments)
save & close (or close saving the file)
then it applyies the commits and at the end it will open another file that looks like:
# This is a combination of 26 commits.
# This is the 1st commit message:

Check interruption in include/dijkstra

# This is the commit message #2:

Check interruption in include/dijkstra

# This is the commit message #3:

Check interruption in include/allpairs
...
Mohamed Bakli
@mbakli
When I closed the file I got this message
Cannot 'squash' without a previous commit
Vicky Vergara
@cvvergara
The first line does not say squash says pick
you need to change the comands from pick to squash as in this example
pick 3f5a7a3cc Check interruption in include/dijkstra
squash c1e8d07cd Check interruption in include/dijkstra
squash f67c53d5a Check interruption in include/allpairs
...
Mohamed Bakli
@mbakli
Ok
To update, should I use this command: git rebase --continue.
or delete the rebase-merge and run the command again
Vicky Vergara
@cvvergara
sec, did it open a second file?
The second file works a bit different
you need to remove what is unnecessary as commit message
Second file looks like
# This is a combination of 26 commits.
# This is the 1st commit message:

Check interruption in include/dijkstra

# This is the commit message #2:

Check interruption in include/dijkstra

# This is the commit message #3:

Check interruption in include/allpairs
...
delete the unnecessary lines and add lines like
Honoring cancellation request (closes #232)
* allpairs
* dijkstra
* (list of directories you can get from the end of the file)

This must be at the end of the file (with comments)

    modified:   NEWS
    modified:   doc/src/pgRouting-introduction.rst
    modified:   doc/src/release_notes.rst
    modified:   include/allpairs/pgr_allpairs.hpp
    modified:   include/astar/pgr_astar.hpp
    modified:   include/bellman_ford/pgr_bellman_ford.hpp
    modified:   include/bellman_ford/pgr_edwardMoore.hpp
    modified:   include/breadthFirstSearch/pgr_breadthFirstSearch.hpp
    modified:   include/contraction/pgr_deadEndContraction.hpp
    new file:   include/cpp_common/interruption.h
    modified:   include/dagShortestPath/pgr_dagShortestPath.hpp
    modified:   include/dijkstra/pgr_dijkstra.hpp
    modified:   include/max_flow/pgr_maxflow.hpp
    modified:   include/spanningTree/pgr_kruskal.hpp
    modified:   include/spanningTree/pgr_mst.hpp
    modified:   include/spanningTree/pgr_prim.hpp
    modified:   include/spanningTree/pgr_randomSpanningTree.hpp
    modified:   include/topologicalSort/pgr_topologicalSort.hpp
    modified:   src/alpha_shape/pgr_alphaShape.cpp
    modified:   src/components/pgr_components.cpp
    modified:   src/trsp/trsp.c

So the directories that you modified are

Vicky Vergara
@cvvergara
  • allpairs
  • astar
  • bellman_ford
  • breadthFirstSearch
  • dagShortestPath
  • dijsktra
  • con traction
  • max_flow
  • spanningTree
  • topologicalSort
  • alphaShape
  • components
  • trsp
So we are working in a different branch we can practice and not mess up with the original that is in master