Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2016-09-08 12:06:11 -04:00
commit 673065ea05
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
4 changed files with 96 additions and 0 deletions

View file

@ -0,0 +1,32 @@
I have one server, two computers, and one external HDD.
The git-annex repo on my server (`nhost`) has the following remotes:
```
qhost qhost:NIdata (fetch)
qhost qhost:NIdata (push)
zhost zhost:NIdata (fetch)
zhost zhost:NIdata (push)
```
The repo on `zhost` has the following remotes:
```
data0 /run/media/mee/data0/NIdata/ (fetch)
data0 /run/media/mee/data0/NIdata/ (push)
nhost nhost:NIdata (fetch)
nhost nhost:NIdata (push)
```
The repo on my HDD (`data0`) has thefollowing remotes:
```
nhost nhost:NIdata (fetch)
nhost nhost:NIdata (push)
qhost /qhost/home/mee/NIdata/ (fetch)
qhost /qhost/home/mee/NIdata/ (push)
zhost /zhost/home/mee/NIdata/ (fetch)
zhost /zhost/home/mee/NIdata/ (push)
```
Any ideas how I can set up a remote from `nhost` to `data0`, without making the identity of data0 dependent on which machine I am using on each particular session?

View file

@ -0,0 +1,49 @@
[[!comment format=mdwn
username="dave@2ab82f485adf7e2ce787066e35f5f9789bff430b"
nickname="dave"
subject="Build failure"
date="2016-09-07T18:25:19Z"
content="""
I cloned the `git-annex` repo from github.com and checked out the `6.20160907` tag.
Then I invoked `stack install` and that ended with the following. Note, this is on Windows.
Configuring concurrent-output-1.7.6...
Building concurrent-output-1.7.6...
Preprocessing library concurrent-output-1.7.6...
[1 of 7] Compiling Utility.Data ( Utility\Data.hs, .stack-work\dist\2672c1f3\build\Utility\Data.o )
[2 of 7] Compiling Utility.Exception ( Utility\Exception.hs, .stack-work\dist\2672c1f3\build\Utility\Exception.o )
[3 of 7] Compiling Utility.Monad ( Utility\Monad.hs, .stack-work\dist\2672c1f3\build\Utility\Monad.o )
[4 of 7] Compiling System.Console.Concurrent.Internal ( System\Console\Concurrent\Internal.hs, .stack-work\dist\2672c1f3\build\System\Console\Concurrent\Internal.o )
[5 of 7] Compiling System.Console.Concurrent ( System\Console\Concurrent.hs, .stack-work\dist\2672c1f3\build\System\Console\Concurrent.o )
[6 of 7] Compiling System.Console.Regions ( System\Console\Regions.hs, .stack-work\dist\2672c1f3\build\System\Console\Regions.o )
System\Console\Regions.hs:559:46: Warning:
Defined but not used: `oldt'
System\Console\Regions.hs:719:1: Warning:
Defined but not used: `calcLineUpdate'
System\Console\Regions.hs:746:1: Warning:
Defined but not used: `advanceLine'
System\Console\Regions.hs:773:1: Warning:
Defined but not used: `isSGR'
System\Console\Regions.hs:777:1: Warning:
Defined but not used: `genLineUpdate'
System\Console\Regions.hs:791:1: Warning:
Defined but not used: `optimiseLineUpdate'
System\Console\Regions.hs:807:1: Warning:
Defined but not used: `combineSGR'
System\Console\Regions.hs:817:1: Warning:
Defined but not used: `combineSGRCodes'
[7 of 7] Compiling System.Process.Concurrent ( System\Process\Concurrent.hs, .stack-work\dist\2672c1f3\build\System\Process\Concurrent.o )
System\Process\Concurrent.hs:24:49:
Not in scope: `createProcessConcurrent'
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="dave@2ab82f485adf7e2ce787066e35f5f9789bff430b"
nickname="dave"
subject="This seems relevant to the comment directly previous this one."
date="2016-09-07T20:27:48Z"
content="""
https://git.joeyh.name/?p=concurrent-output.git;a=blobdiff;f=System/Console/Concurrent.hs;h=d8cea13a3816eba44f8d70a855db21e2dd58a27d;hp=124476379264a94e44b51eb1407fd7d80d0348e7;hb=HEAD;hpb=021358c5a033335e05ec9cff72107ab401217c30
"""]]

View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="pigmonkey"
subject="comment 4"
date="2016-09-07T20:38:35Z"
content="""
That makes sense. Thanks.
"""]]