##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

repoview: only pin obsolete wdir parents while there are unresolved conflicts...
repoview: only pin obsolete wdir parents while there are unresolved conflicts I noticed after doing an update from an obsolete revision with a dirty wdir that the obsolete commit stayed visible for no obvious reason. It was decided in 85b03b1e4715 not to clear mergestate once all of the conflicts were resolved, in order to allow re-resolving. Since the point of pinning the obsolete parents was to allow resolving in the first place (aaeccdb6e654), it makes sense to also gate it on whether or not there are any remaining files to resolve. This might result in pinning again if files are marked unresolved again, but that seems reasonable, given that it still solves the original issue. Note that this isn't purely cosmetic- pushing with a pinned obsolete revision is likely to cause complaints about pushing multiple heads or other unexpected errors. So the faster it comes out of that state, the better. Differential Revision: https://phab.mercurial-scm.org/D9248
Martin von Zweigbergk - - Load All Authors

File last commit:

r43994:a825ba8e stable
r46383:341e014f stable
Show More
5.2
30 lines | 897 B | application/x-troff | GroffLexer
/ relnotes / 5.2
History | Annotation | Raw |Copy content |Copy permalink
== New Features ==
* The amend extension supports the `--currentuser` argument.
* The amend extension supports the `--close-branch` argument.
* The amend extension supports the `--secret` argument.
* The uncommit extension supports the `rewrite.update-timestamp` config option.
== New Experimental Features ==
== Bug Fixes ==
== Backwards Compatibility Changes ==
* A shell that supports `$(command)`` syntax for command substitution is now
required for running the test suite. The test runner normally uses
`sh`, so if that is a shell that doesn't support `$(command)` syntax,
you can override it by setting `$HGTEST_SHELL` or by passing it to
`run-tests.py --shell <shell>`.
* The (experimental) narrow extension's wire protocol changed. If
you're using it, you'll need to make sure to upgrade server and
client at the same time.
== Internal API Changes ==