Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Repo info
Activity
  • May 21 14:03
    naveensrinivasan opened #2303
  • May 19 15:47
    cvvergara edited #2244
  • May 19 15:44
    cvvergara edited #2244
  • May 19 15:43
    cvvergara edited #2244
  • May 19 15:43
    cvvergara edited #2244
  • May 19 15:43
    cvvergara edited #2244
  • May 18 14:22
    cvvergara closed #2297
  • May 17 17:47
    cvvergara labeled #2300
  • May 17 17:47
    cvvergara milestoned #2300
  • May 17 17:47

    cvvergara on develop

    Translations update from OSGeo … (compare)

  • May 17 17:47
    cvvergara closed #2300
  • May 17 16:58
    cvvergara labeled #2302
  • May 17 16:58
    cvvergara labeled #2302
  • May 17 16:57
    cvvergara milestoned #2302
  • May 17 16:57

    github-actions[bot] on gh-pages

    Update users documentation for … (compare)

  • May 17 16:51
    osgeoweblate synchronize #2300
  • May 17 16:51

    cvvergara on develop

    pgr_bddijkstra to pgr_dijkstra (compare)

  • May 17 16:51
    cvvergara closed #2302
  • May 17 16:49
    cvvergara edited #2302
  • May 17 16:42
    nitishchauhan0022 opened #2302
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
I have to go now, family feeding time
On the meantime, just try to do the rebase.
Mohamed Bakli
@mbakli
I finished the work on the first file and now I am on the second file
Vicky Vergara
@cvvergara
I need to go feed the family
Mohamed Bakli
@mbakli
OK, many thanks for your help.
Vicky Vergara
@cvvergara
when you finish make a push and post the link to the branch here
Mohamed Bakli
@mbakli
OK
Vicky Vergara
@cvvergara
I will check how it came out.
We are working on a different branch just in case we mess up we have the original on master, so make sure that you are not on master (git status) before trying again.
Mohamed Bakli
@mbakli
OK, do not worry I am on another branch
Vicky Vergara
@cvvergara
ok, see you tomorrow maybe the same time?
Mohamed Bakli
@mbakli
OK, I will be waiting.
Mohamed Bakli
@mbakli
Vicky Vergara
@cvvergara

topic GSoC students report

Hello students
Ashish Kumar
@krashish8
Hello ma'am
Himanshu Raj
@rajhim2
Hello ma'am
Vicky Vergara
@cvvergara
Hi Ashish, Himanshu, Prakash
Prakash Tiwari
@prakashupes
Hello, ma'am
Vicky Vergara
@cvvergara
This meeting is part of the Bolsena online code sprint, so we will work on combination:
this chat and https://meet.jit.si/pgrouting
This week its also the evaluation period of GSoC, so dont forget to evaluate,
Himanshu Raj
@rajhim2
Done ma'am
Ashish Kumar
@krashish8
Me too
Vicky Vergara
@cvvergara
ok, this meeting will help me to catch up with the last 3 weeks that I had to leave beause of family issues