Replace tabs with spaces and remove trailing whitespaces#3895
Merged
sloriot merged 9 commits intoCGAL:masterfrom Mar 26, 2020
Merged
Replace tabs with spaces and remove trailing whitespaces#3895sloriot merged 9 commits intoCGAL:masterfrom
sloriot merged 9 commits intoCGAL:masterfrom
Conversation
MaelRL
changed the title
Member
Author
|
In this testsuite, there are some warnings due to indentation issues that are due to patches using spaces in files using tabs most probably, I'll fix them. |
Member
|
I see that these errors, in the arrangement package, did not show up
yesterday.
What has changed?
____ _ ____ _
/_____/_) o /__________ __ //
(____ ( ( ( (_/ (_/-(-'_(/
_/
…On Thu, 2 May 2019 at 09:05, Sebastien Loriot ***@***.***> wrote:
in this testsuite
<https://cgal.geometryfactory.com/CGAL/testsuite/results-5.0-Ic-27.shtml>,
there are some warnings due to indentation issues that are due to patches
using spaces in files using tabs most probably, I'll fix them.
I'm a bit worried about the red line in the arrangement testsuite and the
red column about missing boost headers (probably not related to this
branch).
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#3895 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ABVBNODRVOKAQSTTPPBBCUDPTKAA3ANCNFSM4HJUC7LQ>
.
|
Member
Author
|
@efifogel only tabs -> 2spaces and removing trailing whitespaces. |
Member
|
On most platforms I see that 2 tests failed, namely, test_overlay and
test_overlay geodesic_arcs_on_sphere. (the former tests overlay of
arrangements induced by segments).
It seems that they failed because the execution exceeded the time limit.
I cannot reproduce on Ubuntu 16.04.6 LTS, gcc 5.4.0.
Can someone reproduce it?
____ _ ____ _
/_____/_) o /__________ __ //
(____ ( ( ( (_/ (_/-(-'_(/
_/
…On Thu, 2 May 2019 at 09:34, Sebastien Loriot ***@***.***> wrote:
@efifogel <https://github.com/efifogel> only tabs -> 2spaces and removing
trailing whitespaces.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#3895 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ABVBNODAK3FBZRYEZJBVUH3PTKDQVANCNFSM4HJUC7LQ>
.
|
Contributor
|
Too many conflicts approximately everywhere. I won't test it in integration tonight. Probably not before most of the PRs are integrated, to limit conflicts as much as possible. |
Member
|
With the git-merge options |
Member
Author
|
@lrineau I fixed the inconstant indentation issues in flies that were mixing spaces and tabs while restricting the changes to whitespace only. |
lrineau
added
the
Not yet approved
sloriot
force-pushed
the
CGAL-clean_up_tabs_trailingspaces
branch
from
d0d01c3 to
56ef58b
Compare
Member
Author
|
@lrineau new version |
Contributor
|
Lots of conflicts |
sloriot
force-pushed
the
CGAL-clean_up_tabs_trailingspaces
branch
from
56ef58b to
f677c95
Compare
whitespace+tab removal, merged with option -Xignore-all-space
right after the merge of 4.14 release branch
+ manual fix on one line in:
* Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
* .travis/generate_travis.sh
whitespace+tab removal, merged with option -Xignore-space-change
Contributor
|
Successfully tested in https://cgal.geometryfactory.com/CGAL/testsuite/results-5.1-Ic-108.shtml |
right after the merge of the 5.0 release branch + manual fix of the files (indentation was changed in the meantime): * Spatial_sorting/include/CGAL/Multiscale_sort.h * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
sloriot
force-pushed
the
CGAL-clean_up_tabs_trailingspaces
branch
from
f677c95 to
8bb22d5
Compare
Member
Author
|
Includes updates of releases branches, diff with the branch before the push-force is empty. |
sloriot
removed
the
Not yet approved
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.