Page MenuHomePhabricator

Modernize "arc land" for Mercurial: bookmark-to-branch, branch-to-self, multiple heads
Open, LowPublic

Description

This is a followup to T3855, which discussed an array of different issues in Git and Mercurial.

The issues in Git were resolved in work related to T9657. Remaining issues are specific to Mercurial, and likely best resolved with a similar update.

arc land in Mercurial should support these operations (or have some other reasonable behavior when users attempt them):

  • landing from a bookmark to a branch.
  • landing from a branch to a bookmark.
  • landing from a bookmark to itself.
  • landing from a branch to itself.
  • handling situations where a branch has multiple heads.

Also, like the modern Git workflow, the error behavior should be to attempt to restore the original working copy state, even if that means discarding some work.

Event Timeline

epriestley raised the priority of this task from to Low.
epriestley updated the task description. (Show Details)
epriestley changed the edit policy from "All Users" to "Community (Project)".
epriestley added a project: Arcanist.
epriestley added a subscriber: epriestley.
efkan awarded a token.Jan 19 2016, 8:46 AM
efkan added a subscriber: efkan.
eadler removed a subscriber: eadler.Apr 30 2016, 2:12 PM
mwwade added a subscriber: mwwade.May 12 2016, 9:13 PM

For reference, I use this small script to allow myself to easily use arc land with bookmarks:

#!/bin/bash
hg book land --force
hg book master --rev default/default --force
arc land land --onto master
bar350 added a subscriber: bar350.Jul 21 2016, 3:44 PM
alexmv added a subscriber: alexmv.Feb 14 2017, 5:04 AM
gabe awarded a token.Feb 26 2017, 4:55 AM
gabe added a subscriber: gabe.
franjesus added a subscriber: franjesus.
epriestley moved this task from Backlog to arc land on the Mercurial board.Jan 5 2018, 6:55 PM
alexmv removed a subscriber: alexmv.Mar 31 2019, 10:17 PM