Commit Briefs

6e210706a4 Stefan Sperling

implicitly mark all files in work tree as up-to-date after 'got integrate'

Avoids having to run 'got update' for no good reason after 'got integrate'. The same change was made recently for both rebase and histedit in commit a615e0e7796ea1103a6e0d4b5dbb6134597886660 and we forgot about histedit.

diff | patch | tree

54c3959693 Stefan Sperling

use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA

diff | patch | tree

f6d8c0acba Stefan Sperling

fix replacing symlinks with files

And add a test case which verifies that the inverse also works, i.e. a symlink being replaced with a regular file. problem reported and fix tested by jrick

diff | patch | tree

9314b9f4a5 Stefan Sperling

test case for 'got integrate' failing if symlink changes to file; patch by jrick

This test verifies the current behaviour, even though it is not the most desirable behaviour.

diff | patch | tree

f6cae3ed1e Christian Weisgerber

switch function declarations from Korn shell to Bourne/POSIX shell syntax

ok stsp

diff | patch | tree

7fb414ae4d Stefan Sperling

add a -q option to tests for quiet output and use it for 'make regress'

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

diff | patch | tree

8b692cd00b Stefan Sperling

remove lock files, as intended, when reintegrate gets aborted

diff | patch | tree

73529b9f61 Stefan Sperling

set the executable bit on integrate.sh

diff | patch | tree

3aef623b22 Stefan Sperling

catch and reject integration into the freshly rebased branch

diff | patch | tree

2822a3526b Stefan Sperling

add 'got integrate' command

diff | patch | tree