tests-clar/checkout/conflict.c


Log

Author Commit Date CI Message
Vicent Marti d3ed2106 2013-11-01T17:08:32 clar: Fix warnings in GCC/Linux
Edward Thomson 216f97e4 2013-09-23T09:47:47 Two-step conflict checkout (load / perform) Move conflict handling into two steps: load the conflicts and then apply the conflicts. This is more compatible with the existing checkout implementation and makes progress reporting more sane.
Edward Thomson cfae7f85 2013-08-09T20:23:36 Honor UPDATE_ONLY bit when checking out conflicts
Edward Thomson e47f859d 2013-08-08T16:46:49 Don't overwrite ~ files checking out conflicts If a D/F conflict or rename 2->1 conflict occurs, we write the file sides as filename~branchname. If a file with that name already exists in the working directory, write as filename~branchname_0 instead. (Incrementing 0 until a unique filename is found.)
Edward Thomson 96d799aa 2013-07-23T15:32:42 checkout rename conflicts rename conflict tests for checkout conflicts, don't suffix filenames when checking out with USE_OURS or USE_THEIRS
Edward Thomson 3acf44d6 2013-07-17T09:43:32 tests for checkout index with conflicts