|
49c543a6
|
2022-03-31T20:41:38
|
|
use test(1) -eq and -ne to compare integers, and reduce quoting
This brings the rest of the regression test scripts in line with
patch.sh.
|
|
a8a244dd
|
2022-01-03T11:50:14
|
|
simpler fix equivalent to the previous commit
|
|
|
5988bab1
|
2022-01-03T11:48:22
|
|
make test_cherrypick_root_commit pass with GOT_TEST_PACK=1
|
|
566e0ee7
|
2021-11-22T22:32:25
|
|
regress: make test operands POSIX compliant
Since the interpreter for the regress shell scripts are using /bin/sh
this will usually imply some level of POSIX compliance (that isn't
bash-specific, for instance).
Some systems use dash as their sh shell and as such is stricter POSIX
compliance. To help -portable, make the shell test checks use a single
'=' for equality, rather than '=='.
|
|
|
0e039681
|
2021-11-15T17:00:36
|
|
preverse binary files during updates and merges
|
|
|
f10244c0
|
2021-10-11T18:25:11
|
|
fix merging of files which contain a dot on a line by itself
Annoying bug which we inherited from OpenRCS which inherited
it from OpenBSD's diff3 program.
ok tracey millert
|
|
|
c1e86b1d
|
2021-10-08T11:53:05
|
|
add an xfail test for a bug in merging content with a dot on a line by itself
|
|
|
35ca1db7
|
2021-09-28T20:56:04
|
|
print additional stats about things that went wrong during a merge
|
|
|
5267b9e4
|
2021-09-26T11:41:40
|
|
allow bad symlinks to survive a merge
Commands which perform merges will now install bad symlinks as symlinks
in the work tree, instead of creating them as regular files. This means
bad symlinks committed with 'got commit -S' (or Git) will be preserved.
The decision to introduce a bad symlink is done at commit-time and
merges should not forcefully reverse this decision.
The cherrypick and backout commands require a manual commit step, and
a merge result with bad symlinks will require use of 'got commit -S'.
Additional testing by thomas adam
|
|
|
0baddd91
|
2021-09-03T09:11:36
|
|
add test which covers a cherrypick merge from a branch to itself
|
|
|
ed99f061
|
2021-09-03T09:02:06
|
|
add a test case which covers 'got cherrypick' in a mixed-commit work tree
|
|
|
243a13f5
|
2021-09-02T19:13:50
|
|
fix bogus error when 'got cherrypick' merges changes into a locally added file
reported by + ok naddy
|
|
|
54d5be07
|
2021-06-03T13:12:58
|
|
fix unrelated changes being merged by got cherrypick/backout/rebase/histedit
This was a long-standing and very annoying bug.
The two xfail tests in the cherrypick test suite are passing now.
|
|
|
3cd22b21
|
2021-05-31T09:19:13
|
|
add an xfail test for a cherrypick bug where unrelated changes get merged
The test case I am using here is a bit large but I could not yet find a way
to make it smaller. If someone knows a smaller test case, please let me know.
naddy caught a small bug in the new test code I had written, thanks!
|
|
|
cce854ad
|
2021-04-13T09:51:56
|
|
add tests for the bug fixed in commit 1fee9f40e2ed335d4ec8899954b59b43990b97c3
one of these tests is still failing; there is another edge case left to fix
|
|
|
54c39596
|
2020-12-28T17:38:34
|
|
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
|
|
|
f6cae3ed
|
2020-09-13T14:05:17
|
|
switch function declarations from Korn shell to Bourne/POSIX shell syntax
ok stsp
|
|
|
7fb414ae
|
2020-08-08T07:34:47
|
|
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
|
|
|
69d57f3d
|
2020-07-31T11:19:29
|
|
fix spurious 'got cherrypick' error with a path prefix and an empty tree
If the work tree's path prefix does not exist in the first of the two
trees, then 'got cherrypick' failed with "no such entry found in tree".
But this is a legitimate situation, as shown in the new test added here.
The first tree could be the empty tree, for example, which should result
in 'got cherrypick' adding all files from the second tree instead of
complaining about a non-existent path-prefix directory in the first tree.
|
|
|
283102fc
|
2020-07-23T14:22:41
|
|
remove the symlink conflict header feature; it causes noise for little benefit
|
|
|
35213c7c
|
2020-07-23T14:22:39
|
|
forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them
|
|
|
3b9f0f87
|
2020-07-23T14:22:35
|
|
handle additional symlink conflicts and report skipping of unversioned files
|
|
|
c90c8ce3
|
2020-07-23T14:22:35
|
|
preserve unversioned files when merging added symlinks
|
|
|
fba9f79c
|
2020-07-23T14:22:34
|
|
restore unversioned file test case in test_cherrypick_symlink_conflicts
One part of current behaviour is to delete an unversioned file and replace
it with a symlink; that's very bad in case the user wants to keep the file.
|
|
|
d219f183
|
2020-07-23T14:22:34
|
|
test_cherrypick_symlink_conflicts forgot to run 'got add' on a file; fix this
|
|
|
11cc08c1
|
2020-07-23T14:21:31
|
|
handle symlink conflicts by installing a file that contains conflict markers
|
|
|
e26bafba
|
2020-07-23T14:21:31
|
|
add cherrypick test for symlink conflict cases
This test accepts the current behaviour, even though the current behaviour
isn't ideal in some cases.
|
|
|
af57b12a
|
2020-07-23T14:21:30
|
|
add symlink support to 'got cherrypick'; test non-conflict cases only for now
|
|
|
e7303626
|
2020-05-14T19:27:44
|
|
add submodule tests
ok semarie
|
|
|
ceb466a7
|
2020-04-18T11:21:53
|
|
add a test for 'got cherrypick' with existing merge conflicts
|
|
|
a7648d7a
|
2019-06-02T21:35:20
|
|
consistently use leading upper-case for messages indicating success
|
|
|
03415a1a
|
2019-06-02T20:31:34
|
|
allow 'got cherrypick' with a root commit (adds all files in commit)
|
|
|
2b92fad7
|
2019-06-02T17:52:19
|
|
test and fix expected file status after 'got cherrypick'
|
|
|
234035bc
|
2019-06-01T13:35:47
|
|
add 'got cherrypick' command
|