The idea is that got patch can simply look for a line such as: commit - abcde1234567... to find the merge base commit ID to show in diff3 conflict markers. got log -p now displays commit IDs in its diff header, instead ofl tree or blob IDs. ok op@

This brings the rest of the regression test scripts in line with patch.sh.

This is important in cases like 'got diff file.txt file.txt' which should only show the diff for file.txt once. suggested by kn@

In order to portably handle the difference in how 'sed -i' works between *BSD and Linux, provide a wrapper to invoke the underying system sed(1) based on which OSTYPE is in use.

To minimise the amount of churn between the difference in date(1) and ln(n) semantics, use gdate and gln from coreutils.

When 'got update' tried to add a new file to the work tree and this file was obstructed by, say, a directory on disk, the update failed: $ got update ? new got: new: Is a directory $ And the work tree was not updated. With this commit this situation is properly detected as an obstruction and the update succeeds: $ got update ~ new Updated to refs/heads/master: c1f85b4938dc4c668a88f13df2b98a520fc077cc File paths obstructed by a non-regular file: 1 $ Extend a corresponding test case to cover this issue. ok tracey

GNU ln uses -T instead of -h for no-target-directory. OK thomas.adam

ok tracey

ok semarie@

ok naddy

This fixes spurious 'U' notifications for symlinks during 'got update' that occurred even when the work tree was fully up-to-date. Observed on a work tree of the FreeBSD src repo and reproduced in our test suite by adding a no-op update at the end of a test which deals with updating symlinks.

Problem reported by Timo Myyrä

ok stsp

Previous default output remains when test cases are run individually. ok tracey