merge_automatic_tests.py

Checkout Tools
  • last updated 5 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge the 1.8.x-r1702299 branch:

* r1702299, r1702300, r1702397, r1702407, r1702565

Handle merging to local add as error instead of segfault.

Justification:

Segfault. User reported.

Notes:

r1702299 adds a testcase.

r1702397 fixes the problem with automatic merge and updates the test.

r1702565 fixes a quite similar segfault with --reintegrate merge.

The other revisions are minor cleanup.

Branch:

^/subversion/branches/1.8.x-r1702299

Votes:

+1: rhuijben, julianfoad, stefan2

  1. … 4 more files in changeset.
Merge the r1579684 group from trunk:

* r1579684, r1580867, r1580872

Fix issue #4481 "automatic merge confused by missing subtree merge".

Justification:

Valid merges were broken (and gave a confusing error message).

Votes:

+1: julianfoad, rhuijben, philip

  1. … 3 more files in changeset.
Merge the r1467440 group from trunk:

* r1467440, r1467450, r1467481

Unclutter maintainer-mode stack traces.

Justification:

Code was in flux when the branch was cut. Maintainer sanity.

Votes:

+1: danielsh, stsp, brane

  1. … 6 more files in changeset.