Radish alpha
h
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
add a test to repoduce an issue with patch merging
✗ 0/1 checks passed 12b-bdz-dev wants to merge 6 commits into master · opened 5 months ago

This is to reproduce the issue discussed in https://radicle.zulipchat.com/#narrow/channel/369873-Support/topic/Merged.20patch.20still.20appears.20open.20and.20not.20merged/with/562986406

Some checks failed — 0 passed, 1 failed View logs ↗
12b-bdz-dev opened with revision 528ccc6d665da76318342a2b4e842b87311b8d24 on base 352c29c23ce2560750369aa50bc9f43bf3019d3f +234 -0 5 months ago
12b-bdz-dev marked as draft 5 months ago
12b-bdz-dev pushed revision 2 41d104a032319011f80f6f27ee64c9b66e255226 on base 352c29c23ce2560750369aa50bc9f43bf3019d3f +240 -0 5 months ago

Add a rad sync -i step to check if the issue is caused by the identity document changes not being automatically announced.

12b-bdz-dev marked as ready 5 months ago
12b-bdz-dev pushed revision 3 78f28e39258ea5a4363d315f37b1101d7047d982 on base 352c29c23ce2560750369aa50bc9f43bf3019d3f +240 -0 5 months ago

Add a rad sync -a step to check if the issue is caused by the identity document changes not being automatically announced.

did:key:z6MkireR...3voM pushed revision 4 389320b9c36b1543280266180d7fa9ee6b2f34a7 on base 352c29c23ce2560750369aa50bc9f43bf3019d3f +252 -0 5 months ago

REVIEW: clean up test into one file

Some additions:

  • bob checks the delegates
  • bob forks the repository so that master isn't new when they push
did:key:z6MkireR...3voM pushed revision 5 5dd65e2e6ebd86d95434aa8b465b06ca73969bdb on base 352c29c23ce2560750369aa50bc9f43bf3019d3f +141 -5 5 months ago

Changes:

  • Adds fix for when delegates merge patches on their first push
  • Cleans up the test case and renames it
12b-bdz-dev pushed revision 6 9ba2092dd7ac52d8d4aa2f1c4e5aab5676a4f147 on base 352c29c23ce2560750369aa50bc9f43bf3019d3f +309 -0 5 months ago

REVIEW: clean up test into one file

add a rad inspect --refs before and after the rad fork to understand its effect

12b-bdz-dev pushed revision 7 9f7c1ef1efcc40299ce7f8629e41d1501909d164 on base 352c29c23ce2560750369aa50bc9f43bf3019d3f +413 -5 5 months ago

remote-helper: account for fresh push from delegate

An edge case was found where a delegate attempted to merge a patch, but had not pushed to their default branch yet. This resulted in the old not being defined and the check to revert and/or merge not happening – so the patch continued to appear as open.

Since old only matters for the revert and merge check for the default branch, resolving the old side does its best to find a commit for the checks. It does this by falling back to getting the canonical head before the push, and using that as the old.

rebase on fintohaps@z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM