Page MenuHomePhabricator

Sometimes discard already-closed revisions in "arc land"
ClosedPublic

Authored by epriestley on Jun 5 2020, 11:18 PM.
Tags
None
Referenced Files
F13243099: D21322.diff
Thu, May 23, 3:21 AM
F13238684: D21322.diff
Tue, May 21, 8:38 PM
F13237816: D21322.id50750.diff
Tue, May 21, 3:11 PM
F13221632: D21322.diff
Sun, May 19, 2:55 AM
F13202318: D21322.diff
Tue, May 14, 10:32 PM
Unknown Object (File)
Tue, May 7, 1:43 PM
Unknown Object (File)
Tue, May 7, 6:23 AM
Unknown Object (File)
Sat, May 4, 10:49 PM
Subscribers
None

Details

Summary

Ref T13546. When we find commits in history which are associated with already-closed revisions, and they weren't named explicitly on the command line, and we're using a squash strategy, discard them.

This generally happens when "feature2" is on top of "feature1", but "feature1" gets amended or branched elsewhere and lands independently.

Test Plan

Ran "arc land feature3" where prior revisions had already landed, got discards on the duplicated changes.

Diff Detail

Repository
rARC Arcanist
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

This revision was not accepted when it landed; it landed in state Needs Review.Jun 8 2020, 11:17 PM
This revision was automatically updated to reflect the committed changes.