D8151: relnotes: move entry to the right spot

valentin.gatienbaron (Valentin Gatien-Baron) phabricator at mercurial-scm.org
Wed Feb 26 15:57:03 UTC 2020


valentin.gatienbaron created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  It appears a conflict resolution went wrong.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  relnotes/next

CHANGE DETAILS

diff --git a/relnotes/next b/relnotes/next
--- a/relnotes/next
+++ b/relnotes/next
@@ -24,12 +24,12 @@
  * Use `hg copy --forget --at-rev REV` to unmark already committed
    copies.
 
- * prevent pushes of divergent bookmarks (foo at remote)
-
 == Bug Fixes  ==
 
  * Fix server exception when concurrent pushes delete the same bookmark
 
+ * Prevent pushes of divergent bookmarks (foo at remote)
+
 == Backwards Compatibility Changes ==
 
  * When `hg rebase` pauses for merge conflict resolution, the working



To: valentin.gatienbaron, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list