aboutsummaryrefslogtreecommitdiffstats
path: root/subversion/libsvn_ra_serf/commit.c
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2018-10-08 08:44:01 +0000
committerPeter Wemm <peter@FreeBSD.org>2018-10-08 08:44:01 +0000
commit38cef28c88864beaadac7a7cffdec6da952c3eb2 (patch)
tree46e0600e0f1ed07020295bc4ac675cc9f7ce4f6a /subversion/libsvn_ra_serf/commit.c
parentf3520a04ffc9f2c22dc693226fd2a480a4192da1 (diff)
downloadsrc-38cef28c88864beaadac7a7cffdec6da952c3eb2.tar.gz
src-38cef28c88864beaadac7a7cffdec6da952c3eb2.zip
Pull upstream r1839662
"Don't scan for moves for 'local missing' conflicts unless a YCA is known. Prevent the resolver from embarking on an endless search in case of a 'incoming edit vs. local missing' conflict where no YCA can be found which would cap our search through history." Requested by: des
Notes
Notes: svn path=/vendor/subversion/dist/; revision=339234
Diffstat (limited to 'subversion/libsvn_ra_serf/commit.c')
0 files changed, 0 insertions, 0 deletions