This is an archive of the discontinued Mercurial Phabricator instance.

merge: use operation-provided labels (ex: dest/source) in several merge-tools
ClosedPublic

Authored by spectral on Feb 2 2018, 5:10 PM.

Details

Summary

Tools that did not use labels already, used only one, or used some label other
than the exact strings of "local" or "other" were unmodified. Cases that used
the label "base" were modified as well, if they were otherwise changed in this
CL; "merged" was *not* changed.

There are other possible changes we might want to make, but I didn't:

  • bcompare (linux and osx) uses the labels "parent1" and "parent2" instead of "local" and "other", so it was left alone, even though beyondcompare3 (windows) *was* changed.
  • araxis used the labels "Other", "Base", and "Local :$local", so it was also left alone.
  • UltraCompare didn't provide a label for 'local', just for 'base' and 'other', so it was left alone.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

spectral created this revision.Feb 2 2018, 5:10 PM
yuja accepted this revision.Feb 3 2018, 9:36 PM
This revision is now accepted and ready to land.Feb 3 2018, 9:36 PM
This revision was automatically updated to reflect the committed changes.