- 30 Jun, 2015 1 commit
-
-
Edward Thomson committed
-
- 28 May, 2015 1 commit
-
-
Edward Thomson committed
-
- 17 Sep, 2014 1 commit
-
-
Ciro Santilli committed
-
- 16 Sep, 2014 1 commit
-
-
Ciro Santilli committed
-
- 01 Jul, 2014 1 commit
-
-
Edward Thomson committed
-
- 26 Jun, 2014 1 commit
-
-
The checkout::conflict type conflict tests were failing because they were overly assertive about the resultant mode, testing group & other bits, which failed miserably for people who had a umask less restrictive than 022. Only test the resultant owner bits.
Edward Thomson committed
-
- 06 Mar, 2014 1 commit
-
-
Ben Straub committed
-
- 05 Feb, 2014 1 commit
-
-
Ben Straub committed
-
- 25 Jan, 2014 1 commit
-
-
This was not converted when we converted the rest, so do it now.
Carlos Martín Nieto committed
-
- 14 Nov, 2013 1 commit
-
-
Ben Straub committed
-
- 01 Nov, 2013 1 commit
-
-
Vicent Marti committed
-
- 16 Oct, 2013 5 commits
-
-
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 committed -
Edward Thomson committed
-
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 committed -
rename conflict tests for checkout conflicts, don't suffix filenames when checking out with USE_OURS or USE_THEIRS
Edward Thomson committed -
Edward Thomson committed
-