https://launchpad.net/~maestro-alubia
506a402e45
Added a comment: Congratulations!
2014-06-18 09:08:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV4
9dc5c762f1
Added a comment
2014-06-18 07:35:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
65d3b9b25c
2014-06-18 00:14:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
64e1f6472c
2014-06-18 00:14:04 +00:00
Joey Hess
4873348200
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-17 19:52:17 -04:00
Joey Hess
9fb8038166
Windows: Assistant now logs to daemon.log.
...
Yes, this means that git annex webapp on windows execs git-annex, which
execs itself to set env, and the execs itself again to redirect logs.
This is disgusting. This is Windows(TM).
2014-06-17 19:27:54 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlPfB0_GcGJ827kZqRE1PF4D23rxpfOeg4
84469d8ba2
Added a comment
2014-06-17 19:18:09 +00:00
Joey Hess
8eb45f674f
update
2014-06-17 14:34:51 -04:00
Joey Hess
3b914da9bc
update
2014-06-17 14:33:47 -04:00
Joey Hess
611cd84bb2
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-17 14:31:09 -04:00
Joey Hess
ee7be354a1
devblog
2014-06-17 14:29:00 -04:00
Joey Hess
5977e161f3
close
2014-06-17 14:07:16 -04:00
http://joeyh.name/
32c7fdc0f2
Added a comment
2014-06-17 17:18:34 +00:00
http://joeyh.name/
e027801e6e
Added a comment
2014-06-17 17:10:28 +00:00
http://joeyh.name/
914ed75599
Added a comment
2014-06-17 16:56:32 +00:00
http://joeyh.name/
5f3f9601c9
Added a comment
2014-06-17 16:52:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs
ba952aca3c
2014-06-17 13:47:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm9ocq1Kb0WL-cz-LPpvd2Xm-q8tIQvqXA
ec14987706
Added a comment
2014-06-17 00:01:35 +00:00
Joey Hess
5b6f0e317e
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-16 19:56:19 -04:00
Joey Hess
9e1270d723
devblog
2014-06-16 19:55:45 -04:00
http://joeyh.name/
4a4238a373
Added a comment
2014-06-16 23:48:03 +00:00
http://joeyh.name/
672f359260
Added a comment
2014-06-16 23:47:36 +00:00
Joey Hess
257223c748
branch
2014-06-16 19:12:38 -04:00
Joey Hess
0af4dd673c
permissions ugh
2014-06-16 19:12:01 -04:00
Joey Hess
784e916ded
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-16 18:35:59 -04:00
Joey Hess
d27891a70d
split out windows service todo
2014-06-16 18:34:51 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmvzzyDA8uXFz8yokeCrepbh8PwWe_WrjE
bd2626c8cd
Added a comment
2014-06-16 18:19:20 +00:00
http://joeyh.name/
b031978e7a
Added a comment
2014-06-16 18:04:48 +00:00
http://joeyh.name/
d96639cb51
Added a comment
2014-06-16 17:59:20 +00:00
http://joeyh.name/
a33baab2ab
Added a comment
2014-06-16 17:58:22 +00:00
http://joeyh.name/
c46c963909
Added a comment
2014-06-16 17:55:13 +00:00
http://joeyh.name/
c30564d824
Added a comment
2014-06-16 17:52:34 +00:00
Joey Hess
e8b4eb0cdb
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-16 11:33:00 -04:00
Joey Hess
501cc8623a
assistant: Fix one-way assistant->assistant sync in direct mode.
...
When in direct mode, update the master branch after committing to the
annex/direct/master branch. Also, update the synced/master branch.
This fixes a topology A->B where both A and B are in direct mode and
running the assistant, and a change is made to B. Before this fix, A pulled
the changes from B, but since they were only on the annex/direct/master
branch, it did not merge them.
Note that I considered making the assistant merge the
remotes/B/annex/direct/master, but decided to keep it simple and only merge
the sync branches as before.
2014-06-16 11:32:13 -04:00
http://joeyh.name/
a78636e78a
Added a comment
2014-06-16 15:10:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmvzzyDA8uXFz8yokeCrepbh8PwWe_WrjE
52334386b9
Added a comment: debug output
2014-06-16 14:17:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm8wY171R5c4u_jPmB6LU6n6Px2xePM4sE
f19b868173
2014-06-16 13:23:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmvzzyDA8uXFz8yokeCrepbh8PwWe_WrjE
90d80a3a61
2014-06-16 13:08:18 +00:00
Frank2
9ddd8c306f
2014-06-14 22:25:25 +00:00
http://olivier.mehani.name/
7ba53fe00c
Added a comment
2014-06-14 14:15:55 +00:00
http://olivier.mehani.name/
ed2f71e422
Added a comment: Manual solution
2014-06-14 13:59:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnwfqF4wL6l_O26RyzoBowUMvQ_955Vpao
0a478056dd
Added a comment
2014-06-14 06:29:55 +00:00
http://joeyh.name/
1dadac2390
Added a comment
2014-06-13 18:35:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmXSkgjC_ypUQafVwvHTLsStrkiXH8CfHU
36ef4663af
Added a comment
2014-06-13 18:30:25 +00:00
http://joeyh.name/
e9d411d0a6
2014-06-13 14:53:23 +00:00
Joey Hess
6f57e57cf0
add news item for git-annex 5.20140613
2014-06-13 10:34:36 -04:00
Joey Hess
96d22a4bac
devblog
2014-06-12 22:07:17 -04:00
Joey Hess
b30de0dfd2
work around a bug in git
...
http://marc.info/?l=git&m=140262402204212&w=2
This git bug manifested on FAT and Windows as the test suite failing in 3
places. All involved merge conflict resolution. It turned out that the
associated file mappings were getting messed up, and that happened because
this git bug lost track of what files were supposed to be symlinks.
This commit was sponsored by Eric Kidd.
2014-06-12 22:00:02 -04:00
Joey Hess
a7c15d0e51
update
2014-06-12 18:46:07 -04:00
Joey Hess
1bebb0d66f
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-12 16:51:24 -04:00
