equal
deleted
inserted
replaced
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 |