Page MenuHomePhabricator

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

Authored by epriestley on Jun 5 2020, 11:18 PM.

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
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

epriestley created this revision.Jun 5 2020, 11:18 PM
epriestley requested review of this revision.Jun 5 2020, 11:18 PM
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.