Sun, 01 Nov 2015 13:53:05 +0900 import-checker: make it executable for convenience
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Nov 2015 13:53:05 +0900] rev 26954
import-checker: make it executable for convenience
Mon, 09 Nov 2015 17:20:50 -0500 test-fileset: glob the updated file count for Windows stability
Matt Harbison <matt_harbison@yahoo.com> [Mon, 09 Nov 2015 17:20:50 -0500] rev 26953
test-fileset: glob the updated file count for Windows stability Some of the prior changes are platform dependent, involving symlinks, exec bits and non portable names. An update 10 lines above also globbed this value to avoid differences, since this line isn't of particular interest- the filesets are.
Mon, 09 Nov 2015 13:12:35 -0500 tests: tolerate differences between Linux and Windows error strings
Matt Harbison <matt_harbison@yahoo.com> [Mon, 09 Nov 2015 13:12:35 -0500] rev 26952
tests: tolerate differences between Linux and Windows error strings These are related to differences in how missing files and network connection failures are displayed. I opted to combine the strings in one line instead of using '#if windows' blocks around entire commands in order to avoid future changes being accidentally missed in the Windows sections. Globbing away the entire output seemed wrong, as it could mask other failures. The raw messages involved are: Linux Windows "* not known" <-> "getaddrinfo failed" "Connection refused" <-> "No connection could be made because the target machine actively refused it" "No such file or directory" <-> "The system cannot find the file specified" Issue 4941 indicates that NetBSD has yet another string for "* not known". Also, the histedit test shows that the missing file is printed first on Windows, last on Linux. That is controlled in windows.py:posixfile if we care to change it.
Mon, 09 Nov 2015 12:51:58 -0500 test-largefiles-cache: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com> [Mon, 09 Nov 2015 12:51:58 -0500] rev 26951
test-largefiles-cache: add glob for Windows
Mon, 09 Nov 2015 12:49:31 -0500 tests: make 'f' tool open files in binary mode when hexdumping
Matt Harbison <matt_harbison@yahoo.com> [Mon, 09 Nov 2015 12:49:31 -0500] rev 26950
tests: make 'f' tool open files in binary mode when hexdumping On Windows, the various bundle hexdumps were being truncated at the first occurrence of 0x1a. The line endings in the sequence generation then needs to be standardized on LF so that the file is the same for the tool tests.
Thu, 12 Nov 2015 14:29:02 -0800 merge.applyupdates: only attempt to merge files in mergeactions
Siddharth Agarwal <sid0@fb.com> [Thu, 12 Nov 2015 14:29:02 -0800] rev 26949
merge.applyupdates: only attempt to merge files in mergeactions This only makes a difference when a merge driver is active -- in that case we don't want to try and merge all the files, just the ones still unresolved after the merge driver's preprocess step is over.
Wed, 11 Nov 2015 17:34:28 -0800 filemerge: rename _symlinkcheck to _mergecheck
Siddharth Agarwal <sid0@fb.com> [Wed, 11 Nov 2015 17:34:28 -0800] rev 26948
filemerge: rename _symlinkcheck to _mergecheck We're going to be adding other checks in here soon.
Wed, 11 Nov 2015 17:32:41 -0800 test-merge-prompt.t: rename to test-merge-changedelete.t
Siddharth Agarwal <sid0@fb.com> [Wed, 11 Nov 2015 17:32:41 -0800] rev 26947
test-merge-prompt.t: rename to test-merge-changedelete.t Because: (a) the only prompts we test in this file are change/delete prompts, and (b) we're going to be expanding the scope of this test to cover future improvements to change/delete conflicts, including avoiding prompts altogether.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -8 +8 +10 +30 +100 +300 +1000 +3000 +10000 tip