Mercurial > hg
comparison relnotes/next @ 44412:edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
The motivation is simply to make hg work better out of the box.
This is a slight backwards compatibility break, because client
extensions could have assumed that the list of heads the client sees
during discovery will be the list of heads during the entirety of the
push. It seems unlikely to matter, and not worth mentioning.
There's a fair amount of diff in tests, but this is just due to
sending a few more bytes on the wire, except for test-acl.t.
The extra "invalid branch cache" lines in test-acl.t don't seem to
indicate a problem: the branchcache now get computed during the bundle
application (because of the check:updated-heads bundle part), but
doesn't get rolled back when transactions rollback, thus causing a
message in the next operation computing the branch cache. Before this
change, I assume the branchcache was only computed on transaction
commit, so not computed at all when the transactions roll back, thus
no messages.
Differential Revision: https://phab.mercurial-scm.org/D8202
| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
|---|---|
| date | Tue, 25 Feb 2020 20:27:39 -0500 |
| parents | ddbc296a1f48 |
| children | 2f290136b7d6 |
comparison
equal
deleted
inserted
replaced
| 44411:1e508097f570 | 44412:edc8504bc26b |
|---|---|
| 41 | 41 |
| 42 * Fix server exception when concurrent pushes delete the same bookmark | 42 * Fix server exception when concurrent pushes delete the same bookmark |
| 43 | 43 |
| 44 * Prevent pushes of divergent bookmarks (foo@remote) | 44 * Prevent pushes of divergent bookmarks (foo@remote) |
| 45 | 45 |
| 46 * The push error "remote repository changed while pushing - please | |
| 47 try again" now only happens when a concurrent push changed related | |
| 48 heads (instead of when a concurrent pushed any revision). | |
| 49 | |
| 50 | |
| 46 == Backwards Compatibility Changes == | 51 == Backwards Compatibility Changes == |
| 47 | 52 |
| 48 * When `hg rebase` pauses for merge conflict resolution, the working | 53 * When `hg rebase` pauses for merge conflict resolution, the working |
| 49 copy will no longer have the rebased node as a second parent. You | 54 copy will no longer have the rebased node as a second parent. You |
| 50 can use the new `conflictparents()` revset for finding the other | 55 can use the new `conflictparents()` revset for finding the other |