Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Draft: Local test block events #804

Open
hirunda wants to merge 2 commits from local_test_block_events into develop
pull from: local_test_block_events
merge into: Peerplays_Blockchain:develop
Conversation 5 Commits 2 Files changed 2 +30 -6
hirunda commented 2023-05-18 11:46:26 +00:00 (Migrated from gitlab.com)
Copy link
No description provided.
hirunda commented 2023-05-18 11:46:27 +00:00 (Migrated from gitlab.com)
Copy link

requested review from @serkixenos and @vampik

requested review from @serkixenos and @vampik
hirunda commented 2023-05-18 11:46:27 +00:00 (Migrated from gitlab.com)
Copy link

assigned to @hirunda

assigned to @hirunda
vampik commented 2023-05-18 11:56:57 +00:00 (Migrated from gitlab.com)
Copy link

marked this merge request as draft

marked this merge request as **draft**
vampik (Migrated from gitlab.com) changed target branch from master to develop 2023-05-18 11:56:57 +00:00
hirunda commented 2023-05-18 12:11:51 +00:00 (Migrated from gitlab.com)
Copy link

added 40 commits

  • f929e7c2...d367c308 - 39 commits from branch develop
  • ed9ffc4a - Merge branch 'develop' into local_test_block_events

Compare with previous version

added 40 commits <ul><li>f929e7c2...d367c308 - 39 commits from branch <code>develop</code></li><li>ed9ffc4a - Merge branch &#39;develop&#39; into local_test_block_events</li></ul> [Compare with previous version](/PBSA/peerplays/-/merge_requests/224/diffs?diff_id=684742321&start_sha=f929e7c25dca60c908192d76ca4d6d92fbe31c60)
prandnum commented 2024-01-26 15:12:21 +00:00 (Migrated from gitlab.com)
Copy link

@hirunda can you please provide the verification steps

@hirunda can you please provide the verification steps
This pull request has changes conflicting with the target branch.
  • libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin local_test_block_events:local_test_block_events
git checkout local_test_block_events

Merge

Merge the changes and update on Forgejo.
git checkout develop
git merge --no-ff local_test_block_events
git checkout develop
git merge --ff-only local_test_block_events
git checkout local_test_block_events
git rebase develop
git checkout develop
git merge --no-ff local_test_block_events
git checkout develop
git merge --squash local_test_block_events
git checkout develop
git merge --ff-only local_test_block_events
git checkout develop
git merge local_test_block_events
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
confirmed

   
DevOps

   
documentation

   
enhancement

   
incident

Denotes a disruption to IT services and the associated issues require immediate attention

  
Medium

   
priority::Critical

(optional) Issues that are marked as critical priority. Should be taken care of ASAP.

  
priority::High

(optional) Issues that are marked as high priority.

  
priority::Low

(optional) Issues that are marked as low priority.

  
priority::Medium

(optional) Issues that are marked as medium priority.

  
QA-TestCases::Done

QA-Labels

  
QA-TestCases::InProgress

QA-Labels

  
RNG

   
security

(optional) Issues that relate to the security of the project.

  
severity:: Critical

   
severity:: High

   
severity:: Low

   
severity:: Medium

   
state:: Accepted

Issues that are newly created and have been accepted after review.

  
state:: Blocked

Issues that cannot be worked on due to other factors linked to it.

  
state:: Done

Issues that are closed with a working solution.

  
state:: in progress

Issues that are currently being worked on.

  
state:: in review

Issues that require a proposed solution to be reviewed.

  
state:: on hold

Issues that were at least accepted, that should not be worked on at the moment.

  
state:: Pending

Issues that are newly created and haven't been reviewed.

  
state:: Pushed to Prod

Tickets are verified in the stage infra and needs to be deployed in the production

  
state:: Revision Needed

Issues that need to be revised before being accepted.

  
state::out-of-scope

Task and issues which are out of scope due to change in requirements

  
suggestion

   
support

   
To Do

   
type :: Discussion

   
type :: Duplicate

(optional) Issues that are duplicates of existing issues in the same project.

  
type:: interaction-design

   
type:: New Feature

Issues that bring new functionality to the project.

  
type::bug

BUG

  
type::documentation

Issues that relate to the documentation of the project.

  
type::incident

severe issues that require immediate response

  
type::maintenance

Issues that require maintenance on the project.

  
type::question

Issues that are questions related to the project.

  
type::recurring-tasks

This label is used to track recurring tasks which may repeat daily, weekly or monthly.

  
vulnerability
No labels
confirmed
DevOps
documentation
enhancement
incident
Medium
priority::Critical
priority::High
priority::Low
priority::Medium
QA-TestCases::Done
QA-TestCases::InProgress
RNG
security
severity:: Critical
severity:: High
severity:: Low
severity:: Medium
state:: Accepted
state:: Blocked
state:: Done
state:: in progress
state:: in review
state:: on hold
state:: Pending
state:: Pushed to Prod
state:: Revision Needed
state::out-of-scope
suggestion
support
To Do
type :: Discussion
type :: Duplicate
type:: interaction-design
type:: New Feature
type::bug
type::documentation
type::incident
type::maintenance
type::question
type::recurring-tasks
vulnerability
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Peerplays_Blockchain/peerplays_migrated#804
No description provided.
Delete branch "local_test_block_events"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?