Commits

Commit:
0aeb8099a04ea427eff4a7b6cb52b1cba62a87b0
From:
Stefan Sperling <stsp@stsp.name>
Date:
set a staged file type and handle it separately from the on-disk file type
diff | patch | tree
Commit:
c631b1152565e4c18cb2123e1d3d7c08d513c02f
From:
Stefan Sperling <stsp@stsp.name>
Date:
make staging of symlinks work
diff | patch | tree
Commit:
6131ab45b4ac2e03447e28d41d92c53ecfe632e3
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove pointless error checking in got_fileindex_entry_filetype_set()
diff | patch | tree
Commit:
6e1eade5c833f34c20301fd61b720268525270f8
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix 'got revert' progress output for symlinks
diff | patch | tree
Commit:
3b9f0f87ff620ce7d6ad75195b0c67425bc96ab7
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle additional symlink conflicts and report skipping of unversioned files
diff | patch | tree
Commit:
c90c8ce30c933a907f591ebe599ed6b7506f8217
From:
Stefan Sperling <stsp@stsp.name>
Date:
preserve unversioned files when merging added symlinks
diff | patch | tree
Commit:
65b05cec5f251400ee165670853253a3629f4d28
From:
Stefan Sperling <stsp@stsp.name>
Date:
add an output argument to create_fileindex_entry() Avoids a pointless search of the file index in the case the caller needs to use the newly created file entry.
diff | patch | tree
Commit:
2e1fa22206f9dbaca888c89bb9938782cbb4c5a1
From:
Stefan Sperling <stsp@stsp.name>
Date:
give bad symlinks a dedicated file type in the file index
diff | patch | tree
Commit:
b88d214a31981ae2610d930c34d956143b03c523
From:
Stefan Sperling <stsp@stsp.name>
Date:
use default file permissions when installing "bad" symlinks
diff | patch | tree
Commit:
960094b4eff0069984143900870f8486dbe0a08d
From:
Stefan Sperling <stsp@stsp.name>
Date:
resolve an XXX remark in merge_file_cb()
diff | patch | tree
Commit:
d219f183308acdda359bff4261e6ff7cd249670f
From:
Stefan Sperling <stsp@stsp.name>
Date:
test_cherrypick_symlink_conflicts forgot to run 'got add' on a file; fix this
diff | patch | tree
Commit:
993e2a1b1ac61a9d56877df5325d519f7b737375
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle symlink deletion and symlink conflicts during 'got update'
diff | patch | tree
Commit:
56d815a9328f873fd6818ac625999d06a8752a45
From:
Stefan Sperling <stsp@stsp.name>
Date:
We must null-terminate the result of readlink(3) in merge_symlink().
diff | patch | tree
Commit:
11cc08c1dfab6c56e9e4bd98ba204b5a7d56ea9e
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle symlink conflicts by installing a file that contains conflict markers
diff | patch | tree
Commit:
526a746f455d1ff9cf184982a625225f5b0dd133
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle newly added symlinks during 'got cherrypick'
diff | patch | tree