Page MenuHomePhabricator

Make WorkingCopyBlueprint responsible for performing merges
ClosedPublic

Authored by epriestley on Oct 25 2015, 11:08 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Dec 5, 1:45 PM
Unknown Object (File)
Sun, Dec 1, 3:12 AM
Unknown Object (File)
Wed, Nov 27, 12:07 AM
Unknown Object (File)
Fri, Nov 22, 10:26 PM
Unknown Object (File)
Nov 18 2024, 7:34 AM
Unknown Object (File)
Nov 15 2024, 9:47 AM
Unknown Object (File)
Nov 14 2024, 6:20 AM
Unknown Object (File)
Nov 13 2024, 3:05 PM
Subscribers
None

Details

Summary

Ref T182. Currently, the "RepositoryLand" operation is responsible for performing merges when landing a revision.

However, we'd like to be able to perform these merges in a larger set of cases in the future. For example:

  • After Releeph is revamped, when someone says "I want to merge bug fix X into stable branch Y", it would probably be nice to make that a Buildable and let tests run against it without requring that it actually be pushed anywhere.
  • Same deal if we want a merge-from-Diffusion or cherry-pick-from-Diffusion operation.
  • Similar deal if we want a "random web UI edits from Diffusion".

Move the merging part into WorkingCopy so more applications can share/use it in the future.

A big chunk of this is me making stuff up for now (the ol' undocumented dictionary full of arbitrary magic keys), but I anticipate formalizing it as we move along.

Test Plan

Pushed rGITTEST0d58eef3ce0fa5a10732d2efefc56aec126bc219 up from my local install via "Land Revision".

Diff Detail

Repository
rP Phabricator
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

epriestley retitled this revision from to Make WorkingCopyBlueprint responsible for performing merges.
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added a reviewer: chad.
chad edited edge metadata.
This revision is now accepted and ready to land.Oct 26 2015, 7:33 PM
This revision was automatically updated to reflect the committed changes.