Commits
- 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