diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2018-10-08 08:44:01 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2018-10-08 08:44:01 +0000 |
| commit | 38cef28c88864beaadac7a7cffdec6da952c3eb2 (patch) | |
| tree | 46e0600e0f1ed07020295bc4ac675cc9f7ce4f6a /subversion/svn/help-cmd.c | |
| parent | f3520a04ffc9f2c22dc693226fd2a480a4192da1 (diff) | |
| download | src-test2-38cef28c88864beaadac7a7cffdec6da952c3eb2.tar.gz src-test2-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/svn/help-cmd.c')
0 files changed, 0 insertions, 0 deletions