mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2015-08-25 08:16:17 -07:00
commit 7826f84a81
4 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/design/external_special_remote_protocol/comment_16_62b137a138c143a8110886cc0bbb677e._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="sjvdwalt@3d195104d8f45061da99fe7f0a97d69dfc49bb5d"
nickname="sjvdwalt"
subject="Stream encoding"
date="2015-08-25T00:36:24Z"
content="""
What encoding is used for the stdin/stdout streams used to communicate with remotes?
"""]]

7
doc/forum/Multiple_machine_remotes_on_external_drive.mdwn Normal file
View file

@ -0,0 +1,7 @@
I have a question about remotes behavior on external drives.
Say I have two machines A and B each with a git annex repository at `~/repo`, and an external drive C with the same repository at `/repo`.
I can add C remotes for A and B at, for example, `/media/hdd/repo`, but I'm not certain how it works for C.
Do I stick C into A and add a remote A at path `~/repo`, then stick C into B and add a remote B with the same path `~/repo`? Does git annex handle this sanely?

12
doc/forum/webapp:_disabling_a_paired_repository.mdwn Normal file
View file

@ -0,0 +1,12 @@
I had two repositories, on different machines, created with the assistant, so they were both direct mode.
After pairing each with the other, so that files were merrily flowing back and forth, I happened to do the following:
* on machine A, in the dashboard
* click on the 'actions' emnu for the repository on machine B
* select 'disable'
Result: all references to the repo on machine B have disappeared from the assistant in machine A.
On machine B, I still have the pairing with machine A, and selecting the 'sync now' action seems to be working.
The thing I am curious about is the behaviour on machine A - why is it that I cannot find any reference to it any more in the assistant, so that I can re-enable it?

18
doc/forum/webapp:_disabling_a_paired_repository/comment_1_9dd316fedf55afecbc77f3b99e66d837._comment Normal file
View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="vincent.mcintyre@1318ebde5cb96fc17e59dfa86f399f5634b1facc"
nickname="vincent.mcintyre"
subject="addendum"
date="2015-08-25T10:45:56Z"
content="""
Syncing seems to work only in one direction.
If I go to machine B and:
* change a file
* select 'sync now' from the 'actions' menu for machine A
the webapp says it worked.
But if I login to machine A and inspect the file I expect to have changed, it is 'not available'.
If I run 'git annex get 'baz.txt' on machine A it complains and asks me to make available the reposiotry on machine B.
"""]]