for an emacs implementation needed: equivalent to git reset --soft

[Dr. Arne Babenhauserheide]

Uwe Brauer <oub at mat.ucm.es> writes:

> | 'hg import --bypass' seemed the most promising option, but the 'hg
> | update tip' step that you suggested can end up in conflict.
> | 
> | I've searched for some "plumbing" Hg command corresponding to 'git reset
> | --soft' and couldn't find it.
> `----
>
>  so 
>  hg up 
> might cause problems, he says, all other options 

The goal is to make the modified files stay exactly as they are, right?

For that you can use the merge tool that always uses the local changes:

hg import --bypass && hg update --merge --tool internal:merge-local
(see hg help mergetool for details)

Best wishes,
Arne
-- 
Unpolitisch sein
heißt politisch sein,
ohne es zu merken.
draketo.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 1125 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20221018/677e8714/attachment.asc>