[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [patch: first impression]
From: |
Uwe Brauer |
Subject: |
Re: [patch: first impression] |
Date: |
Tue, 18 Oct 2022 18:47:19 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) |
>>> "DG" == Dmitry Gutov <dgutov@yandex.ru> writes:
> On 18.10.2022 18:38, Uwe Brauer wrote:
>> I am confused now! That description sounds like
>> hg update
>> to me
>> but it seems git reset --soft would not call a merge in the case you
>> describe
> Right.
>> what's about
>> hg update -C
>> Or is that more like git reset --hard?
> Yes, 'hg update -C' is like 'git reset --hard', it that it discards
> uncommitted changes. 'hg update' tries to merge them instead. Just
> like 'git checkout' might do. Either way, they generally change file
> contents on disk.
> 'git reset --soft' (or just 'git reset') doesn't touch file contents
> on disk.
What's about
hg uncommit
Or
Not sure
hg strip --keep -r .
But strip is usually slow.
BTW I can't see much difference in your latest patch, I have to test it more,
the emacs-hg is very slow even from the command line
smime.p7s
Description: S/MIME cryptographic signature
- Re: [patch: first impression], (continued)
- Re: [patch: first impression], Uwe Brauer, 2022/10/17
- Re: [patch: first impression], Dmitry Gutov, 2022/10/17
- Re: [patch: first impression], Uwe Brauer, 2022/10/18
- Re: [patch: first impression], Uwe Brauer, 2022/10/18
- Re: [patch: first impression], Dmitry Gutov, 2022/10/18
- Re: [patch: first impression], Dmitry Gutov, 2022/10/18
- Re: [patch: first impression], Uwe Brauer, 2022/10/18
- Re: [patch: first impression], Dmitry Gutov, 2022/10/18
- Re: [patch: first impression], Uwe Brauer, 2022/10/18
- Re: [patch: first impression], Dmitry Gutov, 2022/10/18
- Re: [patch: first impression],
Uwe Brauer <=
- Re: [patch: first impression], Dmitry Gutov, 2022/10/18
- Re: [patch: first impression], Dr. Arne Babenhauserheide, 2022/10/18
- Re: [patch: first impression], Dr. Arne Babenhauserheide, 2022/10/18
- Re: [patch: first impression], Dmitry Gutov, 2022/10/23
- Re: [patch: first impression], Uwe Brauer, 2022/10/24
- Re: [patch: first impression], Dmitry Gutov, 2022/10/24
- Re: [patch: first impression], Uwe Brauer, 2022/10/24
- Re: [patch: first impression], Dmitry Gutov, 2022/10/25
- Re: [patch: first impression], Uwe Brauer, 2022/10/19
- Re: [patch: first impression], Dmitry Gutov, 2022/10/23