Commits
- 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
- Commit:
1acd48bccbe935fbbd39c3387b92b0fb6aaf444f- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
stop caring about obstructed versioned files in 'got merge'
Tyring to write a test to cover this case I found that obstructed files
are (correctly) detected as local modifications in the work tree. Thus
they trigger the pre-condition check for local modications and 'got merge'
will not even start to do any work in the presence of obstructed files.
- Commit:
a6a8f8bbb699f0f18ebd74c5aa76f6ceb2221f8d- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test for 'got merge' which covers a no-op merge situation
- Commit:
f259c4c18277237ced1043033cb1af739f73db28- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a 'got merge' command for creating merge commits
Additional testing by Thomas Adam.
ok tracey