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

This commit is contained in:
Joey Hess 2013-11-22 14:56:19 -04:00
commit 3a5baf2d48
5 changed files with 254 additions and 0 deletions

View file

@ -0,0 +1,183 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao"
nickname="maurizio"
subject="comment 2"
date="2013-11-22T17:23:19Z"
content="""
Here it is (user name edited):
[[!format sh \"\"\"
0ab193eb-0c76-4559-a93c-2e30ed8630a8 archive timestamp=1384664310.014349s
0ab193eb-0c76-4559-a93c-2e30ed8630a8 datadir on st08 timestamp=1384522780.868451s
0ab193eb-0c76-4559-a93c-2e30ed8630a8 username@st08:~/datadir_annex timestamp=1384540428.076617s
0ab193eb-0c76-4559-a93c-2e30ed8630a8 username@st08:~/datadir_annex timestamp=1384541057.852874s
0ab193eb-0c76-4559-a93c-2e30ed8630a8 username@st08:~/datadir_annex timestamp=1384548609.891111s
1384784127.91222s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384784164.437824s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384784176.944372s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384784179.254498s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384785147.558938s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785147.717223s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785159.041203s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785159.199504s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785185.79485s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785187.318128s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785215.236504s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785215.389096s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785313.539843s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785313.701305s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785315.596206s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785344.184461s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785348.192805s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785402.70316s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785406.524044s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384785446.074236s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384873605.313126s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384873697.029999s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384873761.687234s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384873774.608376s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384926279.456728s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384926368.736s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384926454.99433s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384926494.152645s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384926504.438232s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384934790.89717s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384934848.757067s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384934899.087168s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384934908.238587s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384948772.14552s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384948805.441196s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384948813.397132s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384948921.45481s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384948924.855852s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384949073.988946s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384949082.298976s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384949399.608138s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384949581.12213s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384949583.9923s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384949700.22807s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384949765.484768s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955202.85962s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955230.953995s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955402.534938s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955457.1885s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955524.603709s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955611.891061s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955677.84592s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955689.293082s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955894.057476s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955910.723021s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955914.732132s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955968.717875s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384955969.634658s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384956004.284925s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384956029.567195s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384956188.628995s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384956379.844701s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384956381.613833s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384956387.923418s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384956395.418701s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384956408.792928s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384956504.019733s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384956519.578085s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384956524.419783s 1 391b0557-dc68-4e40-b6d0-da3033588753
1384965891.562742s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384965891.815119s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384965903.355602s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384965905.276128s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384965978.806653s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384965979.393089s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966097.495566s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966097.704474s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966154.97658s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966156.967406s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966233.310488s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966233.522324s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966241.284523s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966241.475381s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966301.688497s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966303.427685s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966392.875983s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966393.38718s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966404.708568s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966406.441164s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966553.557387s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966555.752786s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966653.725847s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966654.23288s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966695.201885s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966695.689398s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966784.556877s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966786.574886s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966791.446852s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966793.218318s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384966884.335685s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384966886.147083s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384967054.857465s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384967055.158871s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384967190.980027s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384967193.176584s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384967328.93796s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384967330.428095s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384967526.127311s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384967526.588491s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384967627.132549s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384967627.685201s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384967686.283694s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384967686.728086s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384967768.270887s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384967768.58402s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384967769.245615s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384967771.122238s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384967813.8197s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384967814.168477s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384967915.243469s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384967917.020051s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384968031.757775s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384968032.190452s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384968035.733635s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384968036.03299s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384968144.555556s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384968144.714535s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384968150.090148s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384968150.820567s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384968304.393177s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384968304.613624s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384968604.499519s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384968604.813256s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384968702.566939s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384968704.427767s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384968725.375289s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384968725.939271s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384968798.402904s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384968798.659754s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384969055.285004s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384969055.715448s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384969159.885115s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384969162.382266s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384969184.633052s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384969185.413769s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384969374.791849s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384969377.497842s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384969475.469111s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384969489.697737s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384969492.087023s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384969492.58214s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384969784.725195s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384969786.49773s 0 391b0557-dc68-4e40-b6d0-da3033588753
1384969814.984624s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
1384969815.397676s 0 391b0557-dc68-4e40-b6d0-da3033588753
391b0557-dc68-4e40-b6d0-da3033588753 client timestamp=1384528843.958836s
391b0557-dc68-4e40-b6d0-da3033588753 username@big:~/datadir/Annex timestamp=1384521164.194035s
668ef9d8-68c6-484e-89e5-06634d590a11 cipher=dFpZLzI4M3ZqVUl1S0p3ajl5N25vUUJyTFJXand5T2pNSGliOGo5WXBkN2NNY3ZqR3pvNmN0L2tLOFFKZW1aWDdHYUpCMGF1UGxybk9zeUdQOEpsMGZ5RzgwTVo1S2N6Rlo1eTVnNXFGYjJmblV0bzRjT3lTb29uZnY1QmpwMVVwYlZEOGVlaVlNR0R5dTcxNW50TFcrU1dSVi9PUXk5RkR6Zm14UFJzZEEvOHB5MTZXbkp5TW13Qm5UZ2FkUEsrUTdVZ2cxVWZnai9mbGRDYWVXYlpDVzFQL2tzanNTMU16aGxuVktETXpOY04vR1lSZnEzNVdJSkpDUEtMV1pPWXczVUVNTEJCNGtmUldiTVZoWWdlYm9NTTN4T2c1RXRvTXEzTytXazNaaFNKeUtsSlNmOUFXdTIrYnZLbkgvSFljSFVPOVlid0lCSHFlSDk0ZVQ3M3E4eHR6ckM1SjdIbjF0dmRSTGVibFFSdzUrdnVMM3p6UDl5R0JOUWNhL3Q4MXVVVGF0RjFjNGoyditZUGRzOUEraHZ5Z29hNkk0SDNiaVdYVnJFQmxTRTdTd3hOcjR3amJzRkd3d1VEUXFFZDhLNTBhWGF6bUY5LzZCZ2F5U1lOZEFDdXdSU2pMOU9qVGJWM29wVGNhNEt1Z09jU1JXRnQ0QUhoZXMxZlpvN1Qzc1o4WTQ3S1dUNVdJM3FjK05aQm5kUk10Nm8zSG1Ccys3cFdDUWVaUGJCbUhwK2ozdGw0cmxhK3FydkF5b3ZOM0xmbEJKdVBpTHNxd3JSUEpXdndkSENzQjlteHovZW9JOUtWUGJKNGxoRExSRVloNDUrNFZ6YmFZQVNZdkcxV2JxSzZTc2ZING90cmRBREZtTFRlRnc3OW92ZXBxQ0pPa21UMFFuR0ZJNG89Cg== encryption=shared name=rsync.net_datadir_annex rsyncurl=rsusername@git-annex-ch-s011.rsync.net-rsusername_datadir_annex.2F:datadir_annex/ type=rsync timestamp=1384948273.302009s
668ef9d8-68c6-484e-89e5-06634d590a11 cipher=dFpZLzI4M3ZqVUl1S0p3ajl5N25vUUJyTFJXand5T2pNSGliOGo5WXBkN2NNY3ZqR3pvNmN0L2tLOFFKZW1aWDdHYUpCMGF1UGxybk9zeUdQOEpsMGZ5RzgwTVo1S2N6Rlo1eTVnNXFGYjJmblV0bzRjT3lTb29uZnY1QmpwMVVwYlZEOGVlaVlNR0R5dTcxNW50TFcrU1dSVi9PUXk5RkR6Zm14UFJzZEEvOHB5MTZXbkp5TW13Qm5UZ2FkUEsrUTdVZ2cxVWZnai9mbGRDYWVXYlpDVzFQL2tzanNTMU16aGxuVktETXpOY04vR1lSZnEzNVdJSkpDUEtMV1pPWXczVUVNTEJCNGtmUldiTVZoWWdlYm9NTTN4T2c1RXRvTXEzTytXazNaaFNKeUtsSlNmOUFXdTIrYnZLbkgvSFljSFVPOVlid0lCSHFlSDk0ZVQ3M3E4eHR6ckM1SjdIbjF0dmRSTGVibFFSdzUrdnVMM3p6UDl5R0JOUWNhL3Q4MXVVVGF0RjFjNGoyditZUGRzOUEraHZ5Z29hNkk0SDNiaVdYVnJFQmxTRTdTd3hOcjR3amJzRkd3d1VEUXFFZDhLNTBhWGF6bUY5LzZCZ2F5U1lOZEFDdXdSU2pMOU9qVGJWM29wVGNhNEt1Z09jU1JXRnQ0QUhoZXMxZlpvN1Qzc1o4WTQ3S1dUNVdJM3FjK05aQm5kUk10Nm8zSG1Ccys3cFdDUWVaUGJCbUhwK2ozdGw0cmxhK3FydkF5b3ZOM0xmbEJKdVBpTHNxd3JSUEpXdndkSENzQjlteHovZW9JOUtWUGJKNGxoRExSRVloNDUrNFZ6YmFZQVNZdkcxV2JxSzZTc2ZING90cmRBREZtTFRlRnc3OW92ZXBxQ0pPa21UMFFuR0ZJNG89Cg== encryption=shared name=rsync.net_datadir_annex rsyncurl=rsusername@git-annex-ch-s011.rsync.net-rsusername_datadir_annex:datadir_annex/ type=rsync timestamp=1384547300.727425s
668ef9d8-68c6-484e-89e5-06634d590a11 rsync.net_datadir_annex timestamp=1384547300.725734s
668ef9d8-68c6-484e-89e5-06634d590a11 rsync.net_datadir_annex timestamp=1384948273.280063s
668ef9d8-68c6-484e-89e5-06634d590a11 transfer timestamp=1384948273.352386s
b0d3c000-0ac9-4a05-aef4-47f826d5c759 client timestamp=1384575989.965159s
b0d3c000-0ac9-4a05-aef4-47f826d5c759 username@mezzo:~/datadir/Annex timestamp=1384547220.353298s
\"\"\"]]
"""]]

View file

@ -0,0 +1,22 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.64"
subject="comment 3"
date="2013-11-22T17:47:30Z"
content="""
Any chance I could get a copy of this git repository? (Excluding the .git/annex part)
Feel free to email me id@joeyh.name to arrange a secure transfer.
Otherwise, I need to see what the git-annex:uuid.log file looked like before this happened to it. The corruption may have occurred progressively in several commits, or all at once.
You might also still have some logs in `.git/annex/daemon.log*`, and sending those might help, assuming the strange messages you mentioned are logged in there.
> 1384785215.389096s 1 0ab193eb-0c76-4559-a93c-2e30ed8630a8
This is pretty weird thing to be in the uuid.log. The \"1\" makes me think this might be a scrambled version of what's normally stored in the trust.log:
> 511f4722-63d5-11e1-8b26-1bb951ea9f7b 1 timestamp=1330630786.417597s
This seems to be the same bug as [[bugs/non-repos in repositories list (+ other weird output) from git annex status]]
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.64"
subject="comment 4"
date="2013-11-22T17:48:37Z"
content="""
What hardware are you running git-annex on?
"""]]

View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao"
nickname="maurizio"
subject="comment 5"
date="2013-11-22T18:22:55Z"
content="""
One client is a thinkpad 121e, the other one a hp Z420 workstation. The archive is a basic Dell desktop. All of them run wheezy with git-annex and git from official backports. The transfer repository is at rsync.net.
The daemon.log file was empty at the time I noticed the situation. Now git-annex has been scanning this repository for some time and the log has information again but it looks a bit too long to be posted here. I will email about the repository copy and the log.
"""]]

View file

@ -0,0 +1,30 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48"
nickname="Abdó"
subject="comment 8"
date="2013-11-22T18:44:35Z"
content="""
> I am not convinced at all that it makes any sense to try to sync git repositories in this way
I agree this is not a good solution.
> I realize that some people drop git checkouts into dropbox and use that, but it's a fundamentally unsound thing to do, and those people are just lucky if they manage to avoid running into problems doing that.
Well, I don't use dropbox (nor annex assistant) but I sync a lot of git repos with unison. It is not luck, it is being careful not to create conflicts. I agree this is not ideal, and I'm looking for a better way to deal with this.
> Also, this feature would only be used by a small number of users
I'm not convinced of that. If done right, nested git repos inside annex could have value.
Let's say you work with 40 git repos some private of yours, others tracking upstream, and you want to sync them across 4 machines (home, work, cloud server, backup). I imagine your preferred solution would be to configure the 4 machines as remotes on every git repo and use mr, am I right?
This has its problems:
1. The set of files you want in the project git repo may not be the same as the set of files you want synced across machines. For instance, I use a large software project that I compile from sources. I want to sync binaries across machines (it takes forever to compile!), but of course I don't want them commited into the project, not even as annexed files.
2. Configuring remotes for every project is tedious. What if some remote changes url? what if I want to change the path of some of the git projects? Every time I add a new repo I need to configure all the 4 remotes. This can be scripted of course, but is not my ideal solution.
What do you think about the submodules route I proposed? I don't like submodules very much, but in this case, I think it could become a good solution. In particular it would solve 1, 2 above and be able to merge conflicting changes on the nested repos.
"""]]