Commit Briefs

283102fc7e Stefan Sperling

remove the symlink conflict header feature; it causes noise for little benefit

diff | patch | tree

35213c7c83 Stefan Sperling

forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them

diff | patch | tree

3b9f0f87ff Stefan Sperling

handle additional symlink conflicts and report skipping of unversioned files

diff | patch | tree

c90c8ce30c Stefan Sperling

preserve unversioned files when merging added symlinks

diff | patch | tree

fba9f79c4f Stefan Sperling

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.

diff | patch | tree

d219f18330 Stefan Sperling

test_cherrypick_symlink_conflicts forgot to run 'got add' on a file; fix this

diff | patch | tree

11cc08c1df Stefan Sperling

handle symlink conflicts by installing a file that contains conflict markers

diff | patch | tree

e26bafba99 Stefan Sperling

add cherrypick test for symlink conflict cases

This test accepts the current behaviour, even though the current behaviour isn't ideal in some cases.

diff | patch | tree

af57b12ab5 Stefan Sperling

add symlink support to 'got cherrypick'; test non-conflict cases only for now

diff | patch | tree

e730362696 Stefan Sperling

add submodule tests

ok semarie

diff | patch | tree

ceb466a7cc Stefan Sperling

add a test for 'got cherrypick' with existing merge conflicts

diff | patch | tree

a7648d7ad7 Stefan Sperling

consistently use leading upper-case for messages indicating success

diff | patch | tree

03415a1a67 Stefan Sperling

allow 'got cherrypick' with a root commit (adds all files in commit)

diff | patch | tree

2b92fad780 Stefan Sperling

test and fix expected file status after 'got cherrypick'

diff | patch | tree

234035bc79 Stefan Sperling

add 'got cherrypick' command

diff | patch | tree