On 4/26/2013 4:14 PM, Justin Lebar wrote: >> If I have a patch ready to land when inbound closes, what would be the >> sequence of steps that I need to do to land it on inbound2? Would I >> need to have an up-to-date inbound2 clone and transplant the patch >> across? > Yes, I think so. > > I think mbrubeck or someone knows how to maintain multiple hg branches > in one repo, but I've never figured that out...
I just added a section to https://developer.mozilla.org/en-US/docs/Developer_Guide/Source_Code/Mercurial detailing how to use bookmarks to produce a unified Mercurial repository. I just recently switched my workflow to this model. Honestly, I'm torn. I really like having everything in one central repository. But, the workflow is really awkward. I have to remember which bookmark is active. And when pushing you have to limit the push to just the bookmark you want pushed otherwise Mercurial will attempt to push everything (and the push hooks should reject it because it would result in new heads). Contrast this with Git, where you can control exactly what refs gets pushed to different remotes. AFAICT, there is no built-in way to do this with Mercurial. I guess you can always define aliases or write your own extension. Perhaps if we defined bookmarks on our repositories that tracked the default branch head things would be easier? I encourage people to experiment with this workflow. But, be warned it may be a bit weird. _______________________________________________ dev-platform mailing list dev-platform@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-platform
