Page MenuHomePhabricator

update: suggest --merge while `hg up` across topo branches
Changes PlannedPublic

Authored by khanchi97 on Jun 21 2020, 10:12 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Before this patch, during hg up across topological branches with
dirty working directory we suggested the user to "commit or update
--clean to discard"

I think suggesting --merge is better than --clean (which discard
changes with no backup). We can keep all the three options, but
probably then we will have sacrifice length of message.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

khanchi97 created this revision.Jun 21 2020, 10:12 PM

We have not made this change before because there is no hg update --abort. Do we have that feature yet (I haven't followed all the changes recently)?

We have not made this change before because there is no hg update --abort. Do we have that feature yet (I haven't followed all the changes recently)?

Ah, okay. I see. No, we don't have that feature yet. I sent a patch for hg update --abort but I got stuck in a subrepo case where we can lose some changes. I think now I am gonna revisit that case again, and try to figure out the fix or will start a discussion on that. Thanks :)
(both of these have some discussion on it https://phab.mercurial-scm.org/D7786 https://phab.mercurial-scm.org/D6735)

mjacob added a subscriber: mjacob.Jun 23 2020, 9:00 AM

I think it would be a good idea to mention both --clean and --merge, but mentioning only --merge is better than mentioning only --clean.

I think it would be a good idea to mention both --clean and --merge, but mentioning only --merge is better than mentioning only --clean.

+1 on that.

I hope we can get this soon.

also: can we move this to "change planned" so that it stop showing up in yadda?

khanchi97 planned changes to this revision.Jul 16 2020, 2:40 PM