Patchwork D8151: relnotes: move entry to the right spot

login
register
mail settings
Submitter phabricator
Date Feb. 26, 2020, 3:57 p.m.
Message ID <differential-rev-PHID-DREV-c5qmasmhico6vsa6tcjn-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45332/
State Superseded
Headers show

Comments

phabricator - Feb. 26, 2020, 3:57 p.m.
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




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

Patch

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@remote)
-
 == Bug Fixes  ==
 
  * Fix server exception when concurrent pushes delete the same bookmark
 
+ * Prevent pushes of divergent bookmarks (foo@remote)
+
 == Backwards Compatibility Changes ==
 
  * When `hg rebase` pauses for merge conflict resolution, the working