Commits

Commit:
8469d82143a591d423c000c47c63bababe6f5716
From:
Stefan Sperling <stsp@stsp.name>
Date:
always show commit or tree IDs in diff header, in order to help 'got patch' 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@
diff | patch | tree
Commit:
842467521f94def2d4cce96b3c39f8bbad73bd0b
From:
Omar Polo <op@omarpolo.com>
Date:
set `ret' in a few places where it was forgotten; ok tracey@
diff | patch | tree
Commit:
a19f439c4e07de5c812f1771b37cecbba6e631c4
From:
Omar Polo <op@omarpolo.com>
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@
diff | patch | tree
Commit:
49c543a6fe888394ca86e6399c706a9965486134
From:
Christian Weisgerber <naddy@mips.inka.de>
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.
diff | patch | tree
Commit:
a8a244dd9f028cb4a3a7f05a51ec1bdcb96f3195
From:
Stefan Sperling <stsp@stsp.name>
Date:
simpler fix equivalent to the previous commit
diff | patch | tree
Commit:
5988bab17145d43dfee07a7a1b779ed17c719420
From:
Stefan Sperling <stsp@stsp.name>
Date:
make test_cherrypick_root_commit pass with GOT_TEST_PACK=1
diff | patch | tree
Commit:
566e0ee7be3658e35381b86aee2469c0838c6985
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 '=='.
diff | patch | tree
Commit:
0e039681388d7ec1f832edcbb108ac28db95ae1e
From:
Stefan Sperling <stsp@stsp.name>
Date:
preverse binary files during updates and merges
diff | patch | tree
Commit:
f10244c07ff073c7f69ecf2044ac34e85f0666a0
From:
Stefan Sperling <stsp@stsp.name>
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
diff | patch | tree
Commit:
c1e86b1d5bb299f6bcc93a8024575a12da339286
From:
Stefan Sperling <stsp@stsp.name>
Date:
add an xfail test for a bug in merging content with a dot on a line by itself
diff | patch | tree
Commit:
35ca1db76b33010a85a6d0e68e5d78d451028269
From:
Stefan Sperling <stsp@stsp.name>
Date:
print additional stats about things that went wrong during a merge
diff | patch | tree
Commit:
5267b9e4960076d7de62633b9f5f1dcdb6594b33
From:
Stefan Sperling <stsp@stsp.name>
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
diff | patch | tree
Commit:
0baddd91502bcd7aca9f72f5ded3609326c953cf
From:
Stefan Sperling <stsp@stsp.name>
Date:
add test which covers a cherrypick merge from a branch to itself
diff | patch | tree
Commit:
ed99f061b0cece8bf32baf31bd5e6b9e39509127
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a test case which covers 'got cherrypick' in a mixed-commit work tree
diff | patch | 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
diff | patch | tree