Commit graph

13291 commits

Author SHA1 Message Date
Joey Hess
b46afa29ac implement import --deduplicate and import --clean-duplicates
Note that --deduplicate currently checksums each file twice,
once to see if it's a known key, and once when importing it.

Perhaps this could be revisited and the extra checksum gotten rid of,
at the cost of not locking down the file when adding it.
2013-08-20 11:00:52 -04:00
Joey Hess
e240cb99f7 Merge branch 'duplicate'
Conflicts:
	debian/changelog
2013-08-20 10:27:24 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk_GWOEjK4Sn4hUB6ofFlE3CNeC7tO56J8
46595f0ba3 Added a comment: Re: installed git-annex on debian but cannot find it 2013-08-20 00:50:28 +00:00
Miles
44ed493392 Added a comment: installed git-annex on debian but cannot find it 2013-08-19 23:29:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaZYaspvzx1lQiM56UQo-X82BnPiAaiEY
00213f50a9 Added a comment: git-annex via comand line 2013-08-19 21:53:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaZYaspvzx1lQiM56UQo-X82BnPiAaiEY
403e0ab447 Added a comment 2013-08-19 18:07:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaZYaspvzx1lQiM56UQo-X82BnPiAaiEY
e1b9054cd3 2013-08-19 18:04:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkjQhXk8KAh9yD0p1R6QzT-Sw7FtHE3d54
6b1fa488da Added a comment 2013-08-19 18:03:41 +00:00
http://marco.paga.myopenid.com/
a2f7d17b59 Added a comment: I forgot to mention 2013-08-19 18:01:47 +00:00
http://marco.paga.myopenid.com/
6f82f6b5c1 Added a comment: Yes, it is possible 2013-08-19 17:59:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkjQhXk8KAh9yD0p1R6QzT-Sw7FtHE3d54
0dfb480be4 2013-08-19 16:57:40 +00:00
guilhem
74759437a9 Added a comment 2013-08-19 16:08:49 +00:00
guilhem
00e46d980b Added a comment 2013-08-19 13:44:35 +00:00
guilhem
4bd63129af Added a comment 2013-08-19 13:22:59 +00:00
http://www.rfc1149.net/
5ab5ced0c2 Added a comment 2013-08-19 11:35:52 +00:00
https://id.koumbit.net/anarcat
27e18f0376 silly tiny bug 2013-08-19 02:21:38 +00:00
guilhem
2babf75c1e Added a comment 2013-08-19 01:05:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmrb8I1K5jjNr7ZrLSvgmkeQGjYauPeGJU
08fc432696 Added a comment 2013-08-18 16:44:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkbxlvsA1U_YBe0iNy6_7mhMfgdEp-VUvM
b56c9f6729 Typo: double 'the' 2013-08-18 11:47:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkF8_uQjLYm5Mf5F_JuVW-BxlvzpWjvR_o
62968ac3f6 2013-08-18 11:29:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkF8_uQjLYm5Mf5F_JuVW-BxlvzpWjvR_o
aaf9c04636 2013-08-18 10:39:34 +00:00
http://www.gl-como.it/author/valhalla/
34c8824353 Added a comment: Direct mode clone of an indirect repo 2013-08-18 08:47:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmzo5L2IJC0GW1JJZZRCCqL9LArLKszZQY
33244a4d34 2013-08-18 03:50:42 +00:00
https://id.koumbit.net/anarcat
19416e41c1 found the fix: remove annex-ignore (?!?) i still think the error message could be improved 2013-08-17 23:52:53 +00:00
https://id.koumbit.net/anarcat
2d0ea6b124 add toc, subscribe 2013-08-17 23:08:33 +00:00
https://id.koumbit.net/anarcat
ca754260e1 Added a comment: copy --to bare still has issues 2013-08-17 23:07:48 +00:00
https://id.koumbit.net/anarcat
e7e93ea1fe some ideas for a fix, link to bare repos problems 2013-08-17 23:06:26 +00:00
https://id.koumbit.net/anarcat
2e0a0efeac fix formatting 2013-08-17 22:57:20 +00:00
https://id.koumbit.net/anarcat
e5c5e459d3 2013-08-17 22:50:08 +00:00
https://id.koumbit.net/anarcat
9c20d9aeb1 more details 2013-08-17 22:18:37 +00:00
http://olivier.berger.myopenid.com/
268f7120fd Added a comment: Experimenting with a CIFS mount point of the NAS and direct mode 2013-08-17 22:11:20 +00:00
http://olivier.berger.myopenid.com/
0bf0f0aead Added a comment: How to sync changes made in another remote when in direct mode 2013-08-17 21:53:58 +00:00
https://lot-of-stuff.info/
9c581b4018 bug on syncing 2013-08-17 20:53:26 +00:00
http://olivier.berger.myopenid.com/
3a47b94369 Added a comment: Mixing indirect mode and direct mode on different remotes 2013-08-17 20:35:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c37ddf978a 2013-08-17 19:52:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkl07YSJRbS0SSgkIaLzzQIw_NwM9BMI5w
f6d66c957b 2013-08-17 19:32:35 +00:00
Joey Hess
2ed1089d9d Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-17 21:30:13 +02:00
Joey Hess
a6a047192e sync, merge: Bug fix: Don't try to merge into master when in a bare repo. 2013-08-17 21:29:44 +02:00
http://olivier.berger.myopenid.com/
a248224c4f Added a comment: rsync remote is basically more intended for backups ? 2013-08-17 17:40:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawle_3FsPDpTLXEiEVv1oPfXG1kAqOc5JUk
8b2a931c01 2013-08-17 15:57:53 +00:00
https://id.koumbit.net/anarcat
6480160315 backport affected too 2013-08-17 15:49:01 +00:00
https://id.koumbit.net/anarcat
4e19d949c7 add debugging info 2013-08-17 15:16:41 +00:00
https://id.koumbit.net/anarcat
efd1f6b6eb add version defailts for angela 2013-08-17 15:13:29 +00:00
https://id.koumbit.net/anarcat
f0479bbca3 will add details 2013-08-17 15:10:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
9fe751329e removed 2013-08-17 13:45:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlpSOjMH7Iaz56v6Pr9KCFSpbvMXvg-y9o
45109f35f5 Added a comment: That's amazing... 2013-08-17 11:18:05 +00:00
94.211.35.149
821a482608 poll vote (Tahoe-LAFS) 2013-08-17 09:06:23 +00:00
http://joeyh.name/
a14c8cec75 Added a comment 2013-08-17 08:59:11 +00:00
Joey Hess
3f3e812c13 add news item for git-annex 4.20130802~bpo70+2 2013-08-17 04:57:16 -04:00
http://olivier.berger.myopenid.com/
eca54a22cf Added a comment: Except I don't have rsync/sftp on the NAS AFAICT 2013-08-17 08:56:37 +00:00