| commit | 4ecd6b16259c58ee7435c90ac0806c0d810a0b5e | [log] [tgz] |
|---|---|---|
| author | Julian Foad <julianfoad@apache.org> | Tue Dec 13 10:20:38 2011 +0000 |
| committer | Julian Foad <julianfoad@apache.org> | Tue Dec 13 10:20:38 2011 +0000 |
| tree | 835482b261e9fc3e9a3b6fc4dc0489f2464570f7 | |
| parent | cfe035941043f31478a9da45ced84d3e8b53b88a [diff] |
On the 'showing-merge-info' branch: fix a WC locking issue after r1213635. Don't take out a WC write lock in 'svn' because we call svn_client_merge4() which does, and we can't nest the locks. * subversion/svn/merge-cmd.c (get_target_and_lock_abspath): Delete. (merge_reintegrate_locked, merge_reintegrate): Combine as one function. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/showing-merge-info@1213637 13f79535-47bb-0310-9956-ffa450edef68