http://jamesjustjames.wordpress.com/
36de0da227
Added a comment: The guy with this bug.
2014-07-09 18:50:25 +00:00
http://joeyh.name/
07bb6b3748
Added a comment
2014-07-09 18:36:36 +00:00
http://joeyh.name/
5fe0f1e939
Added a comment: theory
2014-07-09 18:31:07 +00:00
http://joeyh.name/
b76295a396
Added a comment
2014-07-09 18:25:08 +00:00
http://joeyh.name/
7871699567
Added a comment
2014-07-09 18:20:14 +00:00
Joey Hess
4de0b1693e
more info
2014-07-09 13:43:22 -04:00
Joey Hess
6272d09031
bug
2014-07-09 13:39:02 -04:00
http://svario.it/gioele
9ca4270cce
new bug gpg does not ask for password inside tmux
2014-07-09 16:54:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
856bfcfccf
Added a comment: Same happening here
2014-07-09 14:45:32 +00:00
http://mildred.fr/
855409db88
2014-07-09 14:17:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnu1NjsjNS3m0OxiYLKO-5SKNpSERxpi6k
ac4149706f
Added a comment
2014-07-09 13:56:31 +00:00
zardoz
6b165db9cc
Added a comment
2014-07-09 09:02:59 +00:00
zardoz
7ed729ae51
Added a comment
2014-07-09 08:51:22 +00:00
zardoz
b78752480e
2014-07-09 08:39:58 +00:00
EskildHustvedt
3cf23c5b47
Added a comment
2014-07-09 00:24:37 +00:00
EskildHustvedt
99424c47d4
Reopening
2014-07-09 00:15:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn0aWOz5xMj5VuexPl55h7IasQnsh7sVwE
4f5a81dac4
Added a comment: It works now
2014-07-08 22:47:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao
15f3602f61
Added a comment: package in debian backports shows the same error mesage
2014-07-08 19:25:19 +00:00
zardoz
c61fdd140e
Added a comment
2014-07-08 19:17:29 +00:00
Joey Hess
7db532d53b
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-08 13:57:39 -04:00
Joey Hess
ba42b67c70
Fix bug in automatic merge conflict resolution
...
When one side is an annexed symlink, and the other side is a non-annexed symlink.
In this case, git-merge does not replace the annexed symlink in the work
tree with the non-annexed symlink, which is different from it's handling of
conflicts between annexed symlinks and regular files or directories.
So, while git-annex generated the correct merge commit, the work tree
didn't get updated to reflect it.
See comments on bug for additional analysis.
Did not add this to the test suite yet; just unloaded a truckload of firewood
and am feeling lazy.
This commit was sponsored by Adam Spiers.
2014-07-08 13:55:11 -04:00
http://joeyh.name/
3dcb349409
Added a comment: analysis
2014-07-08 17:52:59 +00:00
Joey Hess
1d966dbe37
confirmed
2014-07-08 12:57:43 -04:00
Joey Hess
67c4cef5e9
fixed
2014-07-08 12:57:13 -04:00
http://joeyh.name/
8c9c55c8ce
Added a comment
2014-07-08 16:44:32 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
42df533f9c
2014-07-08 14:06:31 +00:00
CandyAngel
ac8f1925be
2014-07-08 11:56:54 +00:00
EskildHustvedt
e66d336976
Added a comment
2014-07-08 08:13:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn0aWOz5xMj5VuexPl55h7IasQnsh7sVwE
2de177aba4
2014-07-08 00:34:53 +00:00
Joey Hess
f0c48e8591
moreinfo
2014-07-07 13:42:46 -04:00
Joey Hess
8116d10b8f
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-07 13:31:22 -04:00
Joey Hess
da3d7a369b
confirm
2014-07-07 13:31:13 -04:00
http://joeyh.name/
09ac7438d3
Added a comment
2014-07-07 17:19:03 +00:00
http://joeyh.name/
3d054deb7d
Added a comment
2014-07-07 17:17:50 +00:00
zardoz
8037a3ad73
Added a comment
2014-07-07 14:09:33 +00:00
zardoz
27bc6d8425
2014-07-07 13:48:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
8a1351cea5
Added a comment
2014-07-05 22:29:01 +00:00
http://joeyh.name/
bf03ab3874
Added a comment
2014-07-05 21:55:46 +00:00
http://joeyh.name/
6cdcdea98b
2014-07-05 21:48:42 +00:00
http://joeyh.name/
cd6c771715
Added a comment
2014-07-05 21:17:17 +00:00
Joey Hess
eed552609c
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-05 17:13:19 -04:00
Joey Hess
4a66cd3f91
assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits.
2014-07-05 17:12:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
5969ae14e5
2014-07-05 20:57:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
9d7388745e
2014-07-05 20:56:04 +00:00
http://joeyh.name/
e08ef580ed
Added a comment
2014-07-05 20:34:39 +00:00
EskildHustvedt
5ace35dfb9
2014-07-05 05:15:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
f973499dad
Added a comment
2014-07-04 22:30:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
e38fec4f52
Added a comment
2014-07-04 22:28:27 +00:00
http://joeyh.name/
b5659c2a68
Added a comment
2014-07-04 22:09:38 +00:00
Joey Hess
e0fc5bebab
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-04 18:01:02 -04:00
http://joeyh.name/
3208b70a7f
Added a comment
2014-07-04 21:10:17 +00:00
Joey Hess
1c036d08eb
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-04 16:40:05 -04:00
http://joeyh.name/
0d0451fca5
Added a comment
2014-07-04 19:53:43 +00:00
http://joeyh.name/
0a1875e508
Added a comment
2014-07-04 19:38:19 +00:00
Joey Hess
a2662088e3
dup
2014-07-04 15:34:55 -04:00
Joey Hess
2622fd3192
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-04 15:28:58 -04:00
Joey Hess
e6330988dd
Fix memory leak when committing millions of changes to the git-annex branch
...
Eg after git-annex add has run on 2 million files in one go.
Slightly unhappy with the neeed to use a temp file here, but I cannot see
any other alternative (see comments on the bug report).
This commit was sponsored by Hamish Coleman.
2014-07-04 15:28:07 -04:00
http://joeyh.name/
c85d20d02e
Added a comment
2014-07-04 19:26:00 +00:00
http://joeyh.name/
4b43f4e481
Added a comment
2014-07-04 18:36:49 +00:00
http://joeyh.name/
d0dbaddb46
Added a comment
2014-07-04 18:24:51 +00:00
Joey Hess
8f67151f2a
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-04 14:17:11 -04:00
Joey Hess
32fc3abfdd
bug report
2014-07-04 14:15:38 -04:00
http://joeyh.name/
e6ca67244b
Added a comment
2014-07-04 17:58:10 +00:00
http://joeyh.name/
6f2058e1e6
Added a comment
2014-07-04 17:52:41 +00:00
http://joeyh.name/
024086804b
Added a comment
2014-07-04 17:52:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
15e151726a
Added a comment
2014-07-04 16:25:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
6a62713b20
removed
2014-07-04 16:25:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
fff29ecc2d
Added a comment
2014-07-04 16:23:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
4a1324fc85
removed
2014-07-04 16:22:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
cc46318cfd
Added a comment
2014-07-04 16:21:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
73b16289c1
2014-07-04 15:36:21 +00:00
Joey Hess
3867c3d3bc
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-03 16:41:13 -04:00
http://joeyh.name/
9a1f130294
Added a comment
2014-07-03 20:13:57 +00:00
Joey Hess
63af52b17f
close as dup
2014-07-03 16:12:19 -04:00
http://joeyh.name/
6e3a298029
Added a comment
2014-07-03 20:10:41 +00:00
Joey Hess
03b40d6e4c
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-03 16:03:28 -04:00
Joey Hess
ecddaffd3e
Android: patch git to avoid fchmod, which fails on /sdcard.
2014-07-03 16:02:42 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnxFr-i4nNUVrj3PJ_JKhp7GtZ5Xom7-3w
4c2668b17f
Added a comment: Errors from Screenshots
2014-07-03 20:00:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxFr-i4nNUVrj3PJ_JKhp7GtZ5Xom7-3w
a40a9815da
removed
2014-07-03 19:58:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxFr-i4nNUVrj3PJ_JKhp7GtZ5Xom7-3w
02ded1ad56
Added a comment: Errors from Screenshots
2014-07-03 19:56:58 +00:00
Joey Hess
e0c02c8621
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-03 15:34:10 -04:00
Joey Hess
a3b0fb8330
close
2014-07-03 15:04:16 -04:00
http://joeyh.name/
cb08e06db5
Added a comment
2014-07-03 19:03:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
2d6342c076
2014-07-03 10:01:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
3517600b95
rename bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup___40__fixed_by_regular_update_from_2014-06-30__41__.mdwn to bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__.mdwn
2014-07-03 10:00:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
7838c6e139
rename bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup.mdwn to bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup___40__fixed_by_regular_update_from_2014-06-30__41__.mdwn
2014-07-03 09:59:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
376a72553e
Added a comment: Cconfirmed it was a LXDE issue, now fixed.
2014-07-03 09:58:24 +00:00
josch
84d74c6c13
2014-07-03 06:28:07 +00:00
josch
8c172ffb4a
2014-07-03 06:27:32 +00:00
Joey Hess
68f64de905
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-02 13:40:35 -04:00
http://joeyh.name/
d3054e3c04
Added a comment
2014-07-02 17:28:01 +00:00
http://joeyh.name/
2eb5a3654e
Added a comment
2014-07-02 17:07:33 +00:00
Joey Hess
28d9151513
close
2014-07-02 13:06:54 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmmqnZzN5GP4w2m85_bSx7WSi0pMZvUVn8
a3761d6f89
2014-07-01 10:43:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
c4b43c778a
Added a comment: Can't reproduce
2014-06-30 20:06:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
da0b36e607
2014-06-25 18:32:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
cbc899c934
2014-06-25 17:39:53 +00:00
Xyem
ef495b2e0e
Added a comment
2014-06-24 10:05:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkpIIYg6Fl7OFsOHVPEchZYj68A3dk4lVg
0be60628db
2014-06-24 02:58:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm-YOFNhq40yWnZd5dYxqiYwS8d9hHI0Y8
92cf5ef90a
2014-06-23 06:01:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
93010144dd
2014-06-21 19:08:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
aed1056086
2014-06-21 13:57:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
bc99c5a203
git annex version added to bug report
2014-06-21 01:00:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
afc3789e2e
link fixed
2014-06-21 00:55:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
416a3fa4e9
formatting fix
2014-06-21 00:51:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
cb2397918f
fixed numeric list on my post
2014-06-21 00:45:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
a988a61b5b
2014-06-21 00:44:29 +00:00
http://joeyh.name/
7452ef1e25
Added a comment
2014-06-19 22:39:46 +00:00
Joey Hess
5b478722da
make DistributionUpdate download build-version files and use them in the info files
...
Also automated downloading the builds, finally. I had done it by hand until
now.
Note that the Windows autobuilder has an expired cert, so it will refuse to
download from it currently. I have emailed its admin to get that fixed,
hopefully.
This commit was sponsored by Peter Hogg.
2014-06-18 15:24:18 -04:00
http://joeyh.name/
cef5c48e87
Added a comment
2014-06-18 18:12:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlEXAlu8qKv_FHYOv-uEohdGgMY_Lw-Ges
c2f1c63ef6
2014-06-18 12:28:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs
ba952aca3c
2014-06-17 13:47:48 +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
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
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
http://joeyh.name/
c1ceafeef3
Added a comment
2014-06-12 20:07:30 +00:00
Joey Hess
9a001211a5
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-12 15:52:48 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmXSkgjC_ypUQafVwvHTLsStrkiXH8CfHU
e4c4966231
2014-06-12 19:31:51 +00:00
Joey Hess
b291951180
merge in windows loststamp branch
2014-06-12 15:21:10 -04:00
Joey Hess
9dd380cf3b
this just went from horrible to insanely weird
2014-06-12 15:17:32 -04:00
Joey Hess
4fe2e53f5b
finish fixing windows timezone madness
...
Rather than calculating the TSDelta once, and caching it, this now
reads the inode sential file's InodeCache file once, and then each time a
new InodeCache is generated, looks at the sentinal file to get the current
delta.
This way, if the time zone changes while git-annex is running, it will
adapt.
This adds some inneffiency, but only on Windows, and only 1 stat per new
file added. The worst innefficiency is that `git annex status` and
`git annex sync` will now (on Windows) stat the inode sentinal file once per
file in the repo.
It would be more efficient to use getCurrentTimeZone, rather than needing
to stat the sentinal file. This should be easy to do, once the time
package gets my bugfix patch.
This commit was sponsored by Jürgen Lüters.
2014-06-12 13:54:08 -04:00
martin
aaf8045e56
Added a comment: In reply to comment 11
2014-06-12 09:22:54 +00:00
Joey Hess
3ee75d8738
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-11 19:07:26 -04:00
http://joeyh.name/
4b525889f1
Added a comment
2014-06-11 23:02:28 +00:00
http://joeyh.name/
2cc8a53815
Added a comment
2014-06-11 22:54:48 +00:00
Joey Hess
0c40bf5a94
confirmed
2014-06-11 18:20:58 -04:00
http://joeyh.name/
e48a363c30
Added a comment
2014-06-11 22:11:39 +00:00
http://joeyh.name/
fee38c834b
Added a comment
2014-06-11 20:09:14 +00:00
http://joeyh.name/
c09a2e9f0f
Added a comment
2014-06-11 19:51:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
aaf6b64255
Added a comment
2014-06-11 19:47:35 +00:00
http://joeyh.name/
398640f35e
Added a comment
2014-06-11 19:09:17 +00:00
http://joeyh.name/
764340e7a2
Added a comment
2014-06-11 18:59:49 +00:00
Joey Hess
1c18056e15
deal with FAT on Linux timestamp issue
...
Deal with FAT's low resolution timestamps, which in combination with
Linux's caching of higher res timestamps while a FAT is mounted, caused
direct mode repositories on FAT to seem to have modified files after they
were unmounted and remounted.
This commit was sponsored by Fabrice Rossi.
2014-06-11 14:46:03 -04:00
Joey Hess
d7ef984999
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-11 14:40:36 -04:00
Joey Hess
73aa19a0dc
split out bug report from FAT:_Date_resolution_for_mtime_2s--__62___implications
2014-06-11 14:32:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV4
f137ab8144
Added a comment
2014-06-11 18:29:38 +00:00
http://joeyh.name/
e2186a46ce
Added a comment: FAT MetaData Sucks: an approach
2014-06-11 18:15:59 +00:00
http://joeyh.name/
18ac339ef6
Added a comment
2014-06-11 18:05:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
420fedc193
Added a comment: No git-annex process.
2014-06-11 17:55:56 +00:00
http://joeyh.name/
b35d3afed5
Added a comment
2014-06-11 17:22:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmi0jblSiI4c5-EswqKw4PXkx5M4fuVvdk
4631074747
Added a comment
2014-06-11 16:31:09 +00:00
martin
b0b2e52bbf
Added a comment: specification
2014-06-11 05:43:02 +00:00
http://joeyh.name/
3614706fd6
Added a comment
2014-06-10 19:31:38 +00:00
http://joeyh.name/
f7baa697e7
Added a comment
2014-06-10 19:27:55 +00:00
martin
9ece87c421
Added a comment: git-annex add (called by sync) should do the job and bring the files back home (IMHO)
2014-06-10 15:58:25 +00:00
Joey Hess
2dfbbc6b43
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-09 19:47:31 -04:00
