Differences between revisions 1 and 2
Revision 1 as of 2016-07-02 03:24:26
Size: 1091
Editor: GregorySzorc
Comment: initial content, mostly from mpm email
Revision 2 as of 2016-09-07 10:17:24
Size: 1207
Comment:
Deletions are marked like this. Additions are marked like this.
Line 21: Line 21:
Other update related feature could also find a caring home in that command

 * prev/next feature from evolve

Note:

This page is primarily intended for developers of Mercurial.

hg goto

Status: Early Proposal

/!\ This is a work in progress

1. Goal

Reinvent hg update without the backwards compatibility concerns.

2. Proposal

From mpm at https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-June/085378.html:

  • aborts if the working copy is dirty
  • use --merge to allow a merge or --clean to discard changes
  • no need for the confusing --check flag
  • allow merging working changes across branches
  • no auto-advancing the active bookmark with no args

Other update related feature could also find a caring home in that command

  • prev/next feature from evolve

As a bonus, the common beginner mistake of thinking "update" only goes forward and then trying to use "revert" to go backwards will probably go away. As for the "merge-if-trivial" mode (which I agree is useful), I'd prefer to do that by refactoring the merge code. There are lots of places where we'd like to do such merges (via --tool, perhaps) and even a few places where we'd like to ask the question of whether a merge is trivial without touching the working copy.


CategoryDeveloper CategoryNewFeatures

GotoCommandPlan (last edited 2016-09-07 10:17:24 by Pierre-YvesDavid)