[Updated] D8646: update: suggest --merge while `hg up` across topo branches

[khanchi97 (Sushil khanchi)]

khanchi97 added a comment.


  In D8646#129176 <https://phab.mercurial-scm.org/D8646#129176>, @martinvonz wrote:
  
  > 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)

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8646/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8646

To: khanchi97, #hg-reviewers
Cc: martinvonz, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200622/2d2984d8/attachment-0002.html>