Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Repo info
Activity
  • 15:54
    osgeoweblate opened #2309
  • May 27 13:59
    cvvergara edited #2244
  • May 27 13:59
    cvvergara edited #2244
  • May 27 13:59
    cvvergara edited #2244
  • May 27 13:59
    cvvergara edited #2244
  • May 27 13:59
    cvvergara edited #2244
  • May 27 13:59
    cvvergara edited #2244
  • May 27 13:59
    cvvergara edited #2244
  • May 27 13:00
    cvvergara edited #2244
  • May 27 12:59
    cvvergara edited #2244
  • May 27 12:59
    cvvergara edited #2244
  • May 27 12:59
    cvvergara edited #2244
  • May 26 17:27
    kimonkrenz opened #2308
  • May 26 17:27
    kimonkrenz labeled #2308
  • May 25 15:58
    cvvergara edited #2244
  • May 25 14:35
    rmarzocchi84 opened #299
  • May 25 14:34
    rmarzocchi84 labeled #299
  • May 25 14:30

    github-actions[bot] on gh-pages

    Update users documentation for … (compare)

  • May 25 14:25

    krashish8 on develop

    chore: Included githubactions i… Bump actions/checkout from 2 to… Bump MarkusJx/install-boost fro… and 1 more (compare)

  • May 25 14:25
    krashish8 closed #2307
Mohamed Bakli
@mbakli
error: pathspec 'upstream/master' did not match any file(s) known to git
Vicky Vergara
@cvvergara
ah, ok, so you dont have upstream pointing to main repo

change this:

 set(PGROUTING_OBJECTS ${PGROUTING_OBJECTS} "$<TARGET_OBJECTS:${subdir}>" include/cpp_common/interruption.h)

to

set(PGROUTING_OBJECTS ${PGROUTING_OBJECTS} "$<TARGET_OBJECTS:${subdir}>")
on the CMakeLists.txt of the root of the repo
Mohamed Bakli
@mbakli
Done
Vicky Vergara
@cvvergara
Follow the style and add the 3.0.1 release notes in this file
https://github.com/pgRouting/pgrouting/blob/master/doc/src/release_notes.rst
Mohamed Bakli
@mbakli
Done. Is it correct?
Vicky Vergara
@cvvergara
You missed the table of contents entry 
.. changelog start

* :ref:`changelog_3_0_1`
* :ref:`changelog_3_0_0`
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.