]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commit
projects / tahoe-lafs / tahoe-lafs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b606ef6) | patch
Detect remote conflict by checking for pending upload.
authorDaira Hopwood <daira@jacaranda.org>
Tue, 3 Nov 2015 22:23:14 +0000 (22:23 +0000)
committermeejah <meejah@meejah.ca>
Wed, 20 Jan 2016 08:33:19 +0000 (01:33 -0700)
commite6e535112e477433929b0622b869664fdcdbcd39
tree3d6f3d9bb2ac766f1c63f21e183e3998e47c3b84tree | snapshot
parentb606ef6857e9e2b312bf038639832a31e79f680ecommit | diff
Detect remote conflict by checking for pending upload.

Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/frontends/magic_folder.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.