Commits
- 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
- Commit:
c90c8ce30c933a907f591ebe599ed6b7506f8217
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
preserve unversioned files when merging added symlinks
- Commit:
fba9f79c4f8a59659511cef89c1fca8809a5dce4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
d219f183308acdda359bff4261e6ff7cd249670f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
test_cherrypick_symlink_conflicts forgot to run 'got add' on a file; fix this
- Commit:
11cc08c1dfab6c56e9e4bd98ba204b5a7d56ea9e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle symlink conflicts by installing a file that contains conflict markers
- Commit:
e26bafba995edab19824ed3ed6d81535259b39f1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add cherrypick test for symlink conflict cases
This test accepts the current behaviour, even though the current behaviour
isn't ideal in some cases.
- Commit:
af57b12ab516c7fa5ecc8bd00db5637240411ed7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add symlink support to 'got cherrypick'; test non-conflict cases only for now
- Commit:
e7303626967ed721dd323a8a6ea6c638aed46c50
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add submodule tests
ok semarie
- Commit:
ceb466a7cccf5ed6424cd7e24839389a42e998c1
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test for 'got cherrypick' with existing merge conflicts
- Commit:
a7648d7ad78682e85d33fb8daf304d2eb4ed1c7b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
consistently use leading upper-case for messages indicating success
- Commit:
03415a1a67d78f2decd6e46d82288a224bd4454d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow 'got cherrypick' with a root commit (adds all files in commit)
- Commit:
2b92fad7804791e1a20f46acf637ff4c40470e50
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
test and fix expected file status after 'got cherrypick'
- Commit:
234035bc7943e32aa92668438f4c0ba9c85e2f83
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add 'got cherrypick' command