e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
43 lines
1.2 KiB
Markdown
43 lines
1.2 KiB
Markdown
Building commit 8baff14054e65ecbe801eb66786a55fa5245cb30 yields this...
|
|
|
|
|
|
<pre>
|
|
[164 of 189] Compiling Command.Sync ( Command/Sync.hs, tmp/Command/Sync.o )
|
|
Command/Sync.hs:268:34:
|
|
Not in scope: `vermarker'
|
|
Perhaps you meant `varmarker' (line 267)
|
|
make: *** [git-annex] Error 1
|
|
</pre>
|
|
|
|
Supplied fix...
|
|
|
|
<pre>
|
|
|
|
From a23a1af99c7a95c316a87f9c6f5f67a6f8ff6937 Mon Sep 17 00:00:00 2001
|
|
From: Jimmy Tang <jtang@tchpc.tcd.ie>
|
|
Date: Wed, 27 Jun 2012 21:55:22 +0100
|
|
Subject: [PATCH 14/14] fix build issue introduced in
|
|
8baff14054e65ecbe801eb66786a55fa5245cb30
|
|
|
|
---
|
|
Command/Sync.hs | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Command/Sync.hs b/Command/Sync.hs
|
|
index b2bf24d..dfaed59 100644
|
|
--- a/Command/Sync.hs
|
|
+++ b/Command/Sync.hs
|
|
@@ -265,7 +265,7 @@ mergeFile file key
|
|
| otherwise = go $ shortHash $ show key
|
|
where
|
|
varmarker = ".variant-"
|
|
- doubleconflict = vermarker `isSuffixOf` (dropExtension file)
|
|
+ doubleconflict = varmarker `isSuffixOf` (dropExtension file)
|
|
go v = takeDirectory file
|
|
</> dropExtension (takeFileName file)
|
|
++ varmarker ++ v
|
|
--
|
|
1.7.11.1
|
|
</pre>
|
|
|
|
[[fixed|done]]
|