Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Repo info
Activity
  • 13:49
    devrimgunduz opened #2190
  • 13:46
    devrimgunduz opened #2189
  • Oct 18 12:43
    CabbaggeCollector opened #2188
  • Oct 15 14:14

    github-actions[bot] on gh-pages

    Update users documentation for … (compare)

  • Oct 15 14:10

    cvvergara on develop

    Coday remaining errors fix (#21… (compare)

  • Oct 15 14:10
    cvvergara closed #2187
  • Oct 14 22:26
    cvvergara synchronize #2187
  • Oct 14 22:20
    cvvergara commented #2187
  • Oct 14 22:17
    cvvergara milestoned #2187
  • Oct 14 22:17
    cvvergara review_requested #2187
  • Oct 14 22:17
    cvvergara review_requested #2187
  • Oct 14 22:17
    cvvergara review_requested #2187
  • Oct 14 22:17
    cvvergara review_requested #2187
  • Oct 14 22:17
    cvvergara review_requested #2187
  • Oct 14 22:17
    cvvergara review_requested #2187
  • Oct 14 22:17
    cvvergara labeled #2187
  • Oct 14 22:17
    cvvergara assigned #2187
  • Oct 14 22:17
    cvvergara opened #2187
  • Oct 14 17:17

    cvvergara on develop

    Fix codacy remaining errors (#2… (compare)

  • Oct 14 17:17
    cvvergara closed #2186
Mohamed Bakli
@mbakli
It should work.
Vicky Vergara
@cvvergara
I got this errors from the code checker:
include/cpp_common/interruption.h:27:  #ifndef header guard has wrong style, please use: INCLUDE_CPP_COMMON_INTERRUPTION_H_  [build/header_guard] [5]
include/cpp_common/interruption.h:39:  #endif line should be "#endif  // INCLUDE_CPP_COMMON_INTERRUPTION_H_"  [build/header_guard] [5]
include/cpp_common/interruption.h:35:  Include the directory when naming .h files  [build/include] [4]
include/cpp_common/interruption.h:36:  Include the directory when naming .h files  [build/include] [4]
include/cpp_common/interruption.h:39:  At least two spaces is best between code and comments  [whitespace/comments] [2]
include/cpp_common/interruption.h:39:  Should have a space between // and comment  [whitespace/comments] [4]
sec fixing format
you are missing an uderscore at the end of INCLUDE_CPP_COMMON_INTERRUPTION_H_

The files instead of

#include "postgres.h"

Use

#include <postgres.h>
Mohamed Bakli
@mbakli
OK
Vicky Vergara
@cvvergara
format for inline comments:
code(space)(space)//(space)comment
So fix the line that starts like
#endif  // IN
Mohamed Bakli
@mbakli
Done
Vicky Vergara
@cvvergara
I still get this
include/cpp_common/interruption.h:39: At least two spaces is best between code and comments
you only have one space
Mohamed Bakli
@mbakli
What about now?
Vicky Vergara
@cvvergara
that change is not needed so do (I suppose here that you have upstream pointing to the main repo)
git checkout upstream/master CMakeLists.txt
commit and push
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