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
F15465449: D21322.id50750.diff
Wed, Apr 2, 6:54 PM
F15457217: D21322.id.diff
Sun, Mar 30, 3:01 PM
F15447076: D21322.id50750.diff
Thu, Mar 27, 9:45 PM
F15440124: D21322.id50784.diff
Wed, Mar 26, 11:07 AM
F15435810: D21322.id.diff
Tue, Mar 25, 10:20 AM
F15434479: D21322.diff
Tue, Mar 25, 4:01 AM
F15431200: D21322.diff
Mon, Mar 24, 11:05 AM
F15430707: D21322.id50750.diff
Mon, Mar 24, 8:37 AM
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
Branch
land12
Lint
Lint Passed
SeverityLocationCodeMessage
Advicesrc/land/engine/ArcanistLandEngine.php:1486XHP16TODO Comment
Unit
Tests Passed
Build Status
Buildable 24572
Build 33873: Run Core Tests
Build 33872: arc lint + arc unit

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.