D3479: update: print warning about hidden changeset after update

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Tue May 8 14:19:55 EDT 2018


martinvonz added a comment.


  In https://phab.mercurial-scm.org/D3479#55208, @lothiraldan wrote:
  
  > Does it means that someone that try to update to a hidden changeset with a dirty conflicting workdir will first need to solve the conflict before seeing that the changeset is hidden and that it could be potentially the source of the conflict?
  
  
  Added test case for that. It wasn't working before because I was checking "not ret". I think I had been writing too much C code recently.

REPOSITORY
  rHG Mercurial

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

To: martinvonz, #hg-reviewers
Cc: lothiraldan, mercurial-devel


More information about the Mercurial-devel mailing list