From d370aff8dcbb973d2b31e91a8861b5b42b6175e4 Mon Sep 17 00:00:00 2001 From: "https://dead-doomer.livejournal.com/" <https://dead-doomer.livejournal.com/@web> Date: Tue, 16 Jun 2020 16:11:30 +0000 Subject: [PATCH 1/5] Added a comment: How do I specify a merge command if I don't need separate branches? --- ..._8fd44c93bf7997452907f69a076ebc81._comment | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 doc/tips/android_sync_with_adb/comment_1_8fd44c93bf7997452907f69a076ebc81._comment diff --git a/doc/tips/android_sync_with_adb/comment_1_8fd44c93bf7997452907f69a076ebc81._comment b/doc/tips/android_sync_with_adb/comment_1_8fd44c93bf7997452907f69a076ebc81._comment new file mode 100644 index 0000000000..1d7a3c8052 --- /dev/null +++ b/doc/tips/android_sync_with_adb/comment_1_8fd44c93bf7997452907f69a076ebc81._comment @@ -0,0 +1,33 @@ +[[!comment format=mdwn + username="https://dead-doomer.livejournal.com/" + subject="How do I specify a merge command if I don't need separate branches?" + date="2020-06-16T16:11:30Z" + content=""" +>>If you want its files to not be in a subdirectory, set it to \"master\" instead. + +I did that. Than I issued: + +git annex import master --from android + +which downloaded a lot of files + +Then: + +git annex merge android/master +merge android/master +merge: android/master - not something we can merge +failed +git-annex: merge: 1 failed + +I tried different combinations of android/master, ./master, master/. , but all seem to fail. + +plain git status shows a lot of non-added files for an \"initial commit\", and no files added. +git annex status lists a lot of + +? [sdcard/bla] + +files. + +Any suggestions? + +"""]] From 273a4b283e923dcfc3c3635a3cf0f2475374eecc Mon Sep 17 00:00:00 2001 From: "https://dead-doomer.livejournal.com/" <https://dead-doomer.livejournal.com/@web> Date: Tue, 16 Jun 2020 16:15:24 +0000 Subject: [PATCH 2/5] removed --- ..._8fd44c93bf7997452907f69a076ebc81._comment | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 doc/tips/android_sync_with_adb/comment_1_8fd44c93bf7997452907f69a076ebc81._comment diff --git a/doc/tips/android_sync_with_adb/comment_1_8fd44c93bf7997452907f69a076ebc81._comment b/doc/tips/android_sync_with_adb/comment_1_8fd44c93bf7997452907f69a076ebc81._comment deleted file mode 100644 index 1d7a3c8052..0000000000 --- a/doc/tips/android_sync_with_adb/comment_1_8fd44c93bf7997452907f69a076ebc81._comment +++ /dev/null @@ -1,33 +0,0 @@ -[[!comment format=mdwn - username="https://dead-doomer.livejournal.com/" - subject="How do I specify a merge command if I don't need separate branches?" - date="2020-06-16T16:11:30Z" - content=""" ->>If you want its files to not be in a subdirectory, set it to \"master\" instead. - -I did that. Than I issued: - -git annex import master --from android - -which downloaded a lot of files - -Then: - -git annex merge android/master -merge android/master -merge: android/master - not something we can merge -failed -git-annex: merge: 1 failed - -I tried different combinations of android/master, ./master, master/. , but all seem to fail. - -plain git status shows a lot of non-added files for an \"initial commit\", and no files added. -git annex status lists a lot of - -? [sdcard/bla] - -files. - -Any suggestions? - -"""]] From 11a15eee2d449828abe6133b96ecab9298eeb1ab Mon Sep 17 00:00:00 2001 From: "https://dead-doomer.livejournal.com/" <https://dead-doomer.livejournal.com/@web> Date: Tue, 16 Jun 2020 16:17:48 +0000 Subject: [PATCH 3/5] Added a comment: How do I specify a merge command if I don't need separate branches? --- ..._18e0b24a2907ba8df033454315e50212._comment | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 doc/tips/android_sync_with_adb/comment_1_18e0b24a2907ba8df033454315e50212._comment diff --git a/doc/tips/android_sync_with_adb/comment_1_18e0b24a2907ba8df033454315e50212._comment b/doc/tips/android_sync_with_adb/comment_1_18e0b24a2907ba8df033454315e50212._comment new file mode 100644 index 0000000000..057a5d968d --- /dev/null +++ b/doc/tips/android_sync_with_adb/comment_1_18e0b24a2907ba8df033454315e50212._comment @@ -0,0 +1,37 @@ +[[!comment format=mdwn + username="https://dead-doomer.livejournal.com/" + subject=" How do I specify a merge command if I don't need separate branches?" + date="2020-06-16T16:17:48Z" + content=""" +>>If you want its files to not be in a subdirectory, set it to \"master\" instead. + +I did that. Than I issued: + +``` +git annex import master --from android +``` + +which downloaded a lot of files + +Then: +``` +git annex merge android/master +merge android/master +merge: android/master - not something we can merge +failed +git-annex: merge: 1 failed +``` + +I tried different combinations of android/master, ./master, master/. , but all seem to fail. + +plain git status shows a lot of non-added files for an \"initial commit\", and no files added. git annex status lists a lot of + +``` +? sdcard/bla +``` + +files. + +Any suggestions? + +"""]] From fc909493e560b13c665ff4752e08d4094d8115a8 Mon Sep 17 00:00:00 2001 From: "https://dead-doomer.livejournal.com/" <https://dead-doomer.livejournal.com/@web> Date: Tue, 16 Jun 2020 16:31:32 +0000 Subject: [PATCH 4/5] Added a comment --- ...comment_2_68affd1a753abdeca0f161698cc63413._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/tips/android_sync_with_adb/comment_2_68affd1a753abdeca0f161698cc63413._comment diff --git a/doc/tips/android_sync_with_adb/comment_2_68affd1a753abdeca0f161698cc63413._comment b/doc/tips/android_sync_with_adb/comment_2_68affd1a753abdeca0f161698cc63413._comment new file mode 100644 index 0000000000..0f1c960c68 --- /dev/null +++ b/doc/tips/android_sync_with_adb/comment_2_68affd1a753abdeca0f161698cc63413._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://dead-doomer.livejournal.com/" + subject="comment 2" + date="2020-06-16T16:31:32Z" + content=""" +At which point should I do ordinary git commits? + +So far the repo has been at just the \"Initial commit\" + +"""]] From 784d9032c2d45eb85ff705232f00d4614d2a8acb Mon Sep 17 00:00:00 2001 From: "gb@4a49bb1afcf3d183bba8f07297b0395808768c6c" <gb@web> Date: Tue, 16 Jun 2020 16:51:40 +0000 Subject: [PATCH 5/5] Added a comment: Is IA.BAK still active? --- ...ment_1_c4ebfb2136bb4b3e21a52aa23717b22a._comment | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/ancient_linux_build_for_arm__63__/comment_1_c4ebfb2136bb4b3e21a52aa23717b22a._comment diff --git a/doc/forum/ancient_linux_build_for_arm__63__/comment_1_c4ebfb2136bb4b3e21a52aa23717b22a._comment b/doc/forum/ancient_linux_build_for_arm__63__/comment_1_c4ebfb2136bb4b3e21a52aa23717b22a._comment new file mode 100644 index 0000000000..d2060ac53f --- /dev/null +++ b/doc/forum/ancient_linux_build_for_arm__63__/comment_1_c4ebfb2136bb4b3e21a52aa23717b22a._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="gb@4a49bb1afcf3d183bba8f07297b0395808768c6c" + nickname="gb" + avatar="http://cdn.libravatar.org/avatar/51ed40932fbf8748c70b31fd7446d40e" + subject="Is IA.BAK still active?" + date="2020-06-16T16:51:40Z" + content=""" +BTW, is INTERNETARCHIVE.BAK still active? + +The official page at https://www.archiveteam.org/index.php?title=INTERNETARCHIVE.BAK says + +> IA.BAK has been broken and unmaintained since about December 2016. The above status page (<http://iabak.archiveteam.org/>) is not accurate as of December 2019. +"""]]