diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-15 13:40:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-15 13:40:12 -0400 |
| commit | a4ea1393cef234518bfa8dcaeb522259a485b414 (patch) | |
| tree | 00202475625bbba86f0401479af1ba63bfe58eab /doc | |
| parent | 1ae9cd20deea16afd49fc8ea2fcb62bb0015027e (diff) | |
Fix direct mode merge bug when a direct mode file was deleted and replaced with a directory. An ordering problem caused the directory to not get created in this case. Thanks to Tim for the test cases.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/Incorrect_merge__44___direct_repos___40__2__41__.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/bugs/Incorrect_merge__44___direct_repos___40__2__41__.mdwn b/doc/bugs/Incorrect_merge__44___direct_repos___40__2__41__.mdwn index 46a07ee6a..9b5d52220 100644 --- a/doc/bugs/Incorrect_merge__44___direct_repos___40__2__41__.mdwn +++ b/doc/bugs/Incorrect_merge__44___direct_repos___40__2__41__.mdwn @@ -40,3 +40,5 @@ remote types: git gcrypt S3 bup directory rsync web webdav glacier hook Linux ceilingcat 3.11.6-1-ARCH #1 SMP PREEMPT Fri Oct 18 23:22:36 CEST 2013 x86_64 GNU/Linux """]] + +> [[fixed|done]] --[[Joey]] |