Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
relnotes/next
author Martin von Zweigbergk <martinvonz@google.com>
Mon, 21 Sep 2020 11:12:58 -0700
changeset 45557 2c86b9587740
parent 45369 5178dd2233d0
child 45751 60d0634c43c2
permissions -rw-r--r--
merge: make low-level update() private (API) We have very few callers left that call the low-level `merge.update()` function. I think it's time to make it private. I'll remove the remaining callers in coming patches, except for one call from the `rebase` module. I hope to eventually fix that too, but it's more complex because it requires teaching `merge.graft()` to work with a dirty working copy. Differential Revision: https://phab.mercurial-scm.org/D9065
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
42271
0ed293a3f00e releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset 
     1
 
== New Features ==
0ed293a3f00e releasenotes: add a file in which to record release notes
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff changeset 
     2
 







45369






5178dd2233d0
rename: add support for --at-rev, which marks as copy and removes the source



Martin von Zweigbergk <martinvonz@google.com>


parents: 
45240

diff
changeset




     3


 * `hg mv -A` can now be used with `--at-rev`. It behaves just like












5178dd2233d0
rename: add support for --at-rev, which marks as copy and removes the source



Martin von Zweigbergk <martinvonz@google.com>


parents: 
45240

diff
changeset




     4


   `hg cp -A --at-rev`, i.e. it marks the destination as a copy of the












5178dd2233d0
rename: add support for --at-rev, which marks as copy and removes the source



Martin von Zweigbergk <martinvonz@google.com>


parents: 
45240

diff
changeset




     5


   source whether or not the source still exists (but the source must












5178dd2233d0
rename: add support for --at-rev, which marks as copy and removes the source



Martin von Zweigbergk <martinvonz@google.com>


parents: 
45240

diff
changeset




     6


   exist in the parent revision).







45169






3496b5f24371
relnotes: extend



Joerg Sonnenberger <joerg@bec.de>


parents: 
45062

diff
changeset




     7









45189






045f5361bd12
relnotes: make spacing before new section consistent



Manuel Jacob <me@manueljacob.de>


parents: 
45169

diff
changeset




     8









44367






9dab3fa64325
copy: add experimental support for marking committed copies



Martin von Zweigbergk <martinvonz@google.com>


parents: 
44365

diff
changeset




     9


== New Experimental Features ==







44343






8561ad49915d
revset: add a revset for parents in merge state



Martin von Zweigbergk <martinvonz@google.com>


parents: 
44289

diff
changeset




    10









45191






fc54f52779dd
relnotes: add release notes for relevant changes I did since the 5.4 release



Manuel Jacob <me@manueljacob.de>


parents: 
45190

diff
changeset




    11














fc54f52779dd
relnotes: add release notes for relevant changes I did since the 5.4 release



Manuel Jacob <me@manueljacob.de>


parents: 
45190

diff
changeset




    12














fc54f52779dd
relnotes: add release notes for relevant changes I did since the 5.4 release



Manuel Jacob <me@manueljacob.de>


parents: 
45190

diff
changeset




    13


== Bug Fixes ==












fc54f52779dd
relnotes: add release notes for relevant changes I did since the 5.4 release



Manuel Jacob <me@manueljacob.de>


parents: 
45190

diff
changeset




    14














fc54f52779dd
relnotes: add release notes for relevant changes I did since the 5.4 release



Manuel Jacob <me@manueljacob.de>


parents: 
45190

diff
changeset




    15









45189






045f5361bd12
relnotes: make spacing before new section consistent



Manuel Jacob <me@manueljacob.de>


parents: 
45169

diff
changeset




    16









42271






0ed293a3f00e
releasenotes: add a file in which to record release notes



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    17


== Backwards Compatibility Changes ==












0ed293a3f00e
releasenotes: add a file in which to record release notes



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    18









45191






fc54f52779dd
relnotes: add release notes for relevant changes I did since the 5.4 release



Manuel Jacob <me@manueljacob.de>


parents: 
45190

diff
changeset




    19









44396






acbfa31cfaf2
debugmergestate: make templated



Martin von Zweigbergk <martinvonz@google.com>


parents: 
44392

diff
changeset




    20









42271






0ed293a3f00e
releasenotes: add a file in which to record release notes



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    21


== Internal API Changes ==












0ed293a3f00e
releasenotes: add a file in which to record release notes



Martin von Zweigbergk <martinvonz@google.com>


parents: 

diff
changeset




    22









45557






2c86b9587740
merge: make low-level update() private (API)



Martin von Zweigbergk <martinvonz@google.com>


parents: 
45369

diff
changeset




    23


 * `merge.update()` is now private (renamed to `_update()`). Hopefully












2c86b9587740
merge: make low-level update() private (API)



Martin von Zweigbergk <martinvonz@google.com>


parents: 
45369

diff
changeset




    24


   the higher-level functions available in the same module cover your












2c86b9587740
merge: make low-level update() private (API)



Martin von Zweigbergk <martinvonz@google.com>


parents: 
45369

diff
changeset




    25


   use cases.












2c86b9587740
merge: make low-level update() private (API)



Martin von Zweigbergk <martinvonz@google.com>


parents: 
45369

diff
changeset




    26
















mercurial