 INFO  Base commit is not in local repository; trying to fetch.
Created and checked out branch arcpatch-D14433.
Created and checked out branch arcpatch-D14431.
Checking patch electrum/electrumabc/transaction.py...
Applied patch electrum/electrumabc/transaction.py cleanly.
 COMMITTED  Successfully committed patch.

 Cherry Pick Failed!
 Exception 
Command failed with error #1!
COMMAND
git cherry-pick -- arcpatch-D14431

STDOUT
On branch arcpatch-D14433
You are currently cherry-picking commit 004ab9baf.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean


STDERR
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

(Run with `--trace` for a full exception trace.)

This revision is now accepted and ready to land.Aug 30 2023, 18:59

rebase

Harbormaster completed remote builds in B24912: Diff 42024.Aug 30 2023, 19:20

Closed by commit rABC774a4e9068f9: [electrum] Rename and move COutPoint to transaction.py:OutPoint (authored by PiRK). · Explain WhyAug 31 2023, 11:01

This revision was automatically updated to reflect the committed changes.

PiRK added a commit: rABC774a4e9068f9: [electrum] Rename and move COutPoint to transaction.py:OutPoint.