Skip to content

Conversation

@PastaPastaPasta
Copy link
Member

based on #3310

@PastaPastaPasta PastaPastaPasta changed the title Fix indentation Fix indentation in test_dash.cpp Jan 30, 2020
@PastaPastaPasta PastaPastaPasta changed the title Fix indentation in test_dash.cpp [Trivial] Fix indentation in test_dash.cpp Jan 30, 2020
@UdjinM6 UdjinM6 added this to the 16 milestone Jan 31, 2020
@codablock
Copy link

needs rebase

Signed-off-by: Pasta <pasta@dashboost.org>
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nACK

This will cause merge conflicts in future backports and is not worth the trouble. The indention is/was wrong in Bitcoin as well and later backports will fix it.

@PastaPastaPasta
Copy link
Member Author

Due to the fact that we renamed it to test_dash any changes to test_bitcoin automatically are conflicts(this is at least what I experienced in my backporting). When I backported changes to test_bitcoin I had to do it manually.

@UdjinM6
Copy link

UdjinM6 commented Jan 31, 2020

I tend to agree with @PastaPastaPasta on that one tbh... Indentation here won't be fixed until 0.19, plus this file should not be touched that often in following backports really. IMO it's ok-ish to fix it now.

@codablock
Copy link

@PastaPastaPasta -Xrename-threshold=20% as git argument helps in such cases when cherry picking commits that involve files that we have internally renamed. There is also the rename from test_bitcoin.cpp -> setup_common.cpp which will happen in one of the future versions, and this one will be a candidate for many conflicts.

@UdjinM6 UdjinM6 removed this from the 16 milestone Apr 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants