This is also made more complicated because Mercurial branches and bookmarks are all in a single shared namespace to some degree. I'm not sure what happens if you try to fetch a bookmark that conflicts with a local branch name (presumably: it renames it as "divergent"?) or try to fetch a branch which conflicts with a local bookmark name (presumably: fails in a way that's hard to detect?).
- Queries
- All Stories
- Search
- Advanced Search
- Transactions
- Transaction Logs
All Stories
Jun 9 2020
When the user specifies arc land --onto marker, I'd like to identify whether marker is a bookmark or branch.
This approximately exists now via T11968.
I'm not 100% sure I got this, but all of these seem to work now:
Jun 8 2020
After D12336:
Jun 7 2020
Jun 6 2020
Will this feature come to diffusion for audit workflows?
Jun 5 2020
Spaces have been working great for my install. The only real place where they're lacking I think arises from their coarseness/mutual-exclusivity.
Just extracting a few blocks of old code for reference:
I may actually make the minimum version whichever version has this fix:
Today, arc land in Mercurial does not support the "merge" land strategy.
I am dropping support for versions of Mercurial older than 2.1.1 (released in May, 2012). This is the first version that: (a) has phases and (b) does not exit 1 when hg pull succeeds but fetches no changes.
After changes connected to T13546, the git workflow now looks like this:
