Commits
- Commit:
2185070209cdb8294a76bf6bc8695326dd4701fc
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
set `ret' in a few places where it was forgotten; ok tracey@
- Commit:
4e2bdb0dade94492580e4fbce20d9717bccc4e61
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
don't pass $ret to test_done on failure when it's known to be zero
Otherwise the test directory it's not left in place; ok tracey@
- Commit:
fc414659b454e49203f7ba02fb9866da42ffb4d0
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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.
- Commit:
ae6fe0f7756c9c1648663b5cf027c35a4ea98774
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
simpler fix equivalent to the previous commit
- Commit:
63625b3caaa100fc5a72577d70b84866c205e5d7
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make test_cherrypick_root_commit pass with GOT_TEST_PACK=1
- Commit:
3a76741959b24e02b76fdd973c68b782d2f4510d
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
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 '=='.
- Commit:
24f136e0f955e179395f9d081b45fbea32f02325
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
preverse binary files during updates and merges
- Commit:
461f6aedbd48fa1a352a579c70013ff02d50a6c5
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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
- Commit:
dc2a05aa2111fe14be0f0c3e025337dc9340b111
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add an xfail test for a bug in merging content with a dot on a line by itself
- Commit:
0ef688596bd8c81c1cf6abdee7aedc07e1cbcbbc
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
print additional stats about things that went wrong during a merge
- Commit:
ace90326f82adffc32a25213124922899e849771
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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
- Commit:
dd6165e49c3235f6e7c8bf7e2c1f9635009f08a4
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
regress: fix test failures using ln(1)
GNU ln uses -T instead of -h for no-target-directory.
OK thomas.adam
- Commit:
0baddd91502bcd7aca9f72f5ded3609326c953cf
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add test which covers a cherrypick merge from a branch to itself
- Commit:
ed99f061b0cece8bf32baf31bd5e6b9e39509127
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test case which covers 'got cherrypick' in a mixed-commit work tree
- Commit:
243a13f59c19fd9761211d200b68b77f99f6aded
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix bogus error when 'got cherrypick' merges changes into a locally added file
reported by + ok naddy
- Commit:
54d5be07768d1e312078b5eb60f0e32738a1631a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
3cd22b214454d9973c61426c8a4bd7cf2f8de6ae
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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!
- Commit:
cce854ad474288cfa4b40b90c875a6b1bb2b67e4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add tests for the bug fixed in commit 1fee9f40e2ed335d4ec8899954b59b43990b97c3
one of these tests is still failing; there is another edge case left to fix
- Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
- Commit:
f6cae3ed1ef0c22150181eeebb8f9e97db99dc5a
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
switch function declarations from Korn shell to Bourne/POSIX shell syntax
ok stsp
- Commit:
7fb414ae4d46ebdaeff458477ba801f9ad5853c4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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
- Commit:
69d57f3de25cfb3fd0cbfef22bd20090b36cee5e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
283102fc7ecc50b874240654162793c0bd07a028
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove the symlink conflict header feature; it causes noise for little benefit
- Commit:
35213c7c838a48142d398147b54bb9938af8cab0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them
- Commit:
3b9f0f87ff620ce7d6ad75195b0c67425bc96ab7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle additional symlink conflicts and report skipping of unversioned files