Page MenuHomePhabricator

Fix a Mercurial issue where split heads would be detected incorrectly
ClosedPublic

Authored by epriestley on May 27 2014, 7:44 PM.

Details

Summary

Ref T5197. When searching for split branch heads, we incorrectly consider descendant heads of other branches. This can cause us to detect a split tip when one does not exist (the old tip is the branch tip, but other descendant heads exist). Instead, consider only heads on the same branch.

Test Plan

Repro is something like this:

  • hg update default
  • hg branch branch1; hg commit ...
  • hg push
  • hg update default; hg commit ...
  • hg push - Previously, we would find the head of branch1 and incorrectly account for it as a head of default.

Diff Detail

Repository
rP Phabricator
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

epriestley retitled this revision from to Fix a Mercurial issue where split heads would be detected incorrectly.
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added a reviewer: btrahan.
btrahan edited edge metadata.
This revision is now accepted and ready to land.Jun 3 2014, 10:04 PM
epriestley updated this revision to Diff 22321.

Closed by commit rP66af361f10d8 (authored by @epriestley).