FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=vendor%2Fsubversion 2021-02-13T13:04:04Z 2021-02-13T13:04:04Z Dimitry Andric dim@FreeBSD.org 2021-02-13T13:04:04Z urn:sha1:8f67d37de16f4d4a3c64b754a079789ce8ad1b25 2020-05-31T20:58:28Z Dimitry Andric dim@FreeBSD.org 2020-05-31T20:58:28Z urn:sha1:bbee6e0814d5875b85b81f26fd4ca7a28b6f9570 2018-10-08T08:44:01Z Peter Wemm peter@FreeBSD.org 2018-10-08T08:44:01Z urn:sha1:38cef28c88864beaadac7a7cffdec6da952c3eb2 "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 2018-10-08T08:34:55Z Peter Wemm peter@FreeBSD.org 2018-10-08T08:34:55Z urn:sha1:f3520a04ffc9f2c22dc693226fd2a480a4192da1 2018-05-08T03:44:38Z Peter Wemm peter@FreeBSD.org 2018-05-08T03:44:38Z urn:sha1:3faf8d6bffc5d0fb2525ba37bb504c53366caf9d 2017-08-10T21:48:34Z Peter Wemm peter@FreeBSD.org 2017-08-10T21:48:34Z urn:sha1:a55fb3c0d5eca7d887798125d5b95942b1f01d4b 2016-12-01T07:45:05Z Peter Wemm peter@FreeBSD.org 2016-12-01T07:45:05Z urn:sha1:608944fa5a78d7f517c9c73a7ded6c130cc97b83 This includes a security fix for a component that we do not build, and two potentially useful client side fixes for reintegrate merges and tree conflict handling. See CHANGES for full details. 2016-04-29T19:16:59Z Dimitry Andric dim@FreeBSD.org 2016-04-29T19:16:59Z urn:sha1:c94cceea9c2262c5b2ad5f215bb9a8ae48b02764 2015-10-12T08:54:49Z Peter Wemm peter@FreeBSD.org 2015-10-12T08:54:49Z urn:sha1:dc5d469d6574e9fb03bdd793658bb371315b306a 2015-08-09T04:37:39Z Peter Wemm peter@FreeBSD.org 2015-08-09T04:37:39Z urn:sha1:58218291fa73a17020ef0447398e9e8a78f9e8c7