-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 3/22/2011 2:05 AM, Terry Reedy wrote: > On 3/21/2011 7:14 AM, Nick Coghlan wrote: > >> hg broadens the check and complains if *any* files are not up to date >> on any of the branches being pushed, thus making it a requirement to >> do a hg pull and merge on all affected branches before the hg push can >> succeed. In theory, this provides an opportunity for the developer >> doing the merge to double check that it didn't break anything, in >> practice (at least in the near term) we're more likely to see an >> SVN-like practice of pushing the merged changes without rerunning the >> full test suite. > > Now that you and John have (finally) explained how 'non-conflict' merges > can actually contain a conflict (and there could be such for docs as > well as code*), I think there is a pretty clear guideline for when to > re-test. > > If my change adds or changes in one file a reference to something in > another file, or changes or subtracts in one file something that might > be referenced by other files, and the the change could affect the > cross-file linkage, and the pulled changes merged with my changes might > have such linkages, then I should rerun tests on the new merged state. > (I say 'might' because it is easier and safer to just rerun than to > check very hard.) Otherwise, it should be safe not to. Correct? >
I would agree with 'might' with the very large caveat that cross-file linkage tends to exist in far more places than most people think. I know I've done a few "single line fixes" where the test suite showed me that it wasn't as simple as that. :) John =:-> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Cygwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk2IbIUACgkQJdeBCYSNAAPsbQCbB53ctC5DQ8hQo1U/1crNsxLc d5EAoIF1/x9hBW2z4X9EfGNaaGM3V8A+ =2HN+ -----END PGP SIGNATURE----- _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
