hg up --keep

[Augie Fackler]

On Mon, Aug 11, 2014 at 06:20:57PM +0300, anatoly techtonik wrote:
> Hi,
>
> While writing a lot of texts about evolve, I remembered
> another problematic user scenario.
>
> $ hg up rel_2.3.0
> abort: uncommitted changes
> (commit or update --clean to discard changes)
>
> The logical way that I think is:
> $ hg stash
> $ hg up rel_2.3.0
> $ hg unstash
>
> But that scenario is not proposed.

Right, shelve isn't in core, so it's not proposed by core (shelve is
an extension, albeit a fantastic one I recommend highly).

> Also, if there is a
> merge conflict with uncommitted changes, I am not
> warned about it.
>
> I think that "hg up --keep" would be more useful:
> $ hg up rel_2.3.0
> abort: uncommitted changes
> (--clean to discard changes, --keep to move changes)
>
> $ hg up --keep rel_2.3.0
> U somefile.txt
> U otherfile.txt
> M modified file
>
> ?

--keep is basically the current behavior, isn't it? The issue with a
  feature like --keep is that you'd end up in a merge conflicted
  state, and no way to abort and go back to what you had before (since
  nothing was committed before you started the merge of the working
  copy and its new parent.)

>
> --
> anatoly t.
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel