Checkout Tools
  • last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge the 1.10.x-r1855419 branch:

* r1855419

Fix conflict resolver bug where local and incoming edits got swapped.

Justification:

Bug breaks text conflict resolution.

User complained: https://svn.haxx.se/dev/archive-2019-03/0012.shtml

Branch:

^/subversion/branches/1.10.x-r1855419

Votes:

+1: stsp

  1. … 2 more files in changeset.
Merge r1853450 from trunk:

* r1853450

Enable 'incoming_move_file_merge' option only if local change is file edit.

Justification:

Conflict resolver misbehaves when it runs into move vs move conflicts.

Votes:

+1: stsp

  1. … 2 more files in changeset.
Merge r1851920 from trunk:

* r1851920

Remove a useless common ancestor search from the conflict resolver.

Justification:

Current behaviour is inefficient and could lead to dubious conflicts.

Votes:

+1: stsp

  1. … 2 more files in changeset.
Merge the 1.10.x-r1846299 branch:

* r1846299

Add resolver support for unversioned directories during update/switch.

Justification:

Support or unversioned files has already been backported.

We should support directories as well for consistency.

Branch:

^/subversion/branches/1.10.x-r1846299

Votes:

+1: stsp, brane, rhuijben

  1. … 3 more files in changeset.
Merge r1846704 from trunk:

* r1846704

Fix SVN-4717 "tree conflict message ends a sentence with a colon".

Justification:

Misleading output from conflict resolver.

Votes:

+1: stsp, danielsh, brane

  1. … 2 more files in changeset.
Merge r1845577 from trunk:

* r1845577

Resolver support for 'added file vs unversioned file' with update/switch.

Justification:

We promised to ship new resolver options in patch releases if possible.

A user noted the lack of this feature, and the change is non-intrusive.

Votes;

+1: stsp, brane, rhuijben

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

* r1836960, r1836968

Fix issue #4766, "resolver adds unrelated moves to move target list"

Justification:

Undesirable resolver behaviour: If an item was moved, all other items

moved within the same revision will be considered viable merge targets.

Notes:

r1836960 adds a regression test

r1836968 fixes the bug

Votes:

+1: stsp, rhuijben, jcorvel

  1. … 3 more files in changeset.
Merge r1839662 from trunk:

* r1839662

For 'local missing' conflicts, scan for moves only if a YCA is known.

Justification:

Prevents long-runing history scan which serves no useful purpose.

User complained: https://svn.haxx.se/users/archive-2018-08/0038.shtml

User complained: https://svn.haxx.se/users/archive-2018-10/0003.shtml

Votes:

+1: stsp, julianfoad, jcorvel

  1. … 2 more files in changeset.
Merge r1836963 from trunk:

* r1836963

Fix potential NULL deref in conflict resolver.

Justification:

Real-world impact unknown. Found during code inspection.

Let us better be safe than sorry.

Votes:

+1: stsp, rhuijben, brane

  1. … 2 more files in changeset.
Merge r1836976 from trunk:

* r1836976

Fix "relpath is canonical" assertion failure in conflict resolver.

Justification:

Assertion can be triggered by cherry-pick merge with a moved directory.

As copyfrom typically starts with a '/'

Notes:

To reproduce, undo r1836976 locally and run the test added in r1836977.

Votes:

+1: stsp, rhuijben, brane

  1. … 2 more files in changeset.
Merge r1840991 from trunk:

* r1840991

Prevent an out-of-bounds array access in the conflict resolver.

Justification:

User can trigger a segfault by selecting conflict menu options in a

particular order. See commit message for details.

Votes:

+1: stsp, rhuijben, brane

  1. … 2 more files in changeset.
Merge r1833895, r1833897, r1833899, and r1833901 from trunk:

* r1833895, r1833897, r1833899, r1833901

Fix issue #4744 "during merge: assertion failed (start_rev > end_rev)"

Justification:

Fixes undesirable conflict resolver behaviour.

Notes:

r1833895 adds a regression test

r1833897 prevents offer of a non-working resolution option

r1833899 fixes accidental test breakage introduced by r1833897

r1833901 prevents the assertion failure and adjusts the test

Issue #4739 fix should be merged before this to avoid merge conflicts.

Votes:

+1: stsp, jcorvel, philip

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

* r1830083, r1833864, r1833866

Fix issue #4739, "Accept incoming deletion" option doing nothing

for a locally deleted file

Justification:

Fixes undesirable conflict resolver behaviour.

Notes:

r1830083 adds a regression test

r1833864 fixes the issue

r1833866 is a small follow-up fix

Issue #4744 fix should be merged after this to avoid merge conflicts.

Votes:

+1: stsp, jcorvel, philip

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

* r1833836, r1833842

Fix issue #4740, "conflict resolver searches too far back ..."

Justification:

The current behaviour is hard-coded to traverse all of history in

a "local missing vs incoming edit" situation. This is impractical

on repositories with a large number of revisions.

Easy fix which just runs an already existing YCA search a bit

earlier, falling back to full traversal if no YCA can be found.

User complained and provided a reproduction script:

https://svn.haxx.se/users/archive-2018-04/0060.shtml

Votes:

+1: stsp, philip, jcorvel

  1. … 2 more files in changeset.
Merge the r1825709 group from trunk:

* r1825709, r1825711

Don't offer conflict resolution options for 'local move vs incoming move'.

Justication:

The resolver does not support 'move vs move' resolution yet.

The current behaviour is misleading.

Votes:

+1: stsp, philip, brane

  1. … 3 more files in changeset.
Merge r1822401 from trunk:

* r1822401

Fix 'dereference pointer to the wrong object' crash in conflict resolver.

Votes:

+1: stsp, rhuijben, jamessan

Veto-blocked changes:

=====================

  1. … 2 more files in changeset.