| commit | 28f1d7aa39e3bab4dfb2e42289e4925390ffd3a3 | [log] [tgz] |
|---|---|---|
| author | svn-role <svn-role@unknown> | Mon Jul 06 04:00:37 2015 +0000 |
| committer | svn-role <svn-role@unknown> | Mon Jul 06 04:00:37 2015 +0000 |
| tree | 9a25f69c9f4e130850ecf3b0e36e30691f2b9881 | |
| parent | 25826a07bc76473ae3aff73e48841a90b7b64747 [diff] |
Merge the r1686175 group from trunk:
* r1686175, r1687029, r1688258
Fix part of issue #4582, "reintegrate complains about missing ranges
from node unrelated to branch"
Justification:
Reintegrate merge is impossible after the default conflict resolution
option is applied to a particular tree conflict during a sync merge.
Votes:
+1: stsp, philip, brane
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.9.x@1689313 13f79535-47bb-0310-9956-ffa450edef68