mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

comment, update tip

Browse source
This commit is contained in:
Joey Hess 2022-10-31 12:16:36 -04:00
parent bf27a02b07
commit 9dc3acc95d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn
View file

@ -49,9 +49,11 @@ This should display something like:
Once you are sure things went on okay, you can synchronise this with `marcos`: Once you are sure things went on okay, you can synchronise this with `marcos`:
git annex sync git annex sync --allow-unrelated-histories
This will push the metadata information to marcos, so it knows which files are available on `angela`. From there on, you can freely get and move files between the two repos! This will push the metadata information to marcos, so it knows which files
are available on `angela`. From there on, you can freely get and move files
between the two repos!
Importing files from a third directory Importing files from a third directory
-------------------------------------- --------------------------------------
@ -61,7 +63,7 @@ Say that some files on `angela` are actually spread out outside of the `~/mp3` d
cd ~/mp3 cd ~/mp3
git annex import ~/music/ git annex import ~/music/
(!) Be careful that `~/music` is not a git-annex repository, or this will [[destroy it!|bugs/git annex import destroys a fellow git annex repository]]. (!) Be careful that `~/music` is not a git-annex repository.
Deleting deleted files Deleting deleted files
---------------------- ----------------------
@ -73,7 +75,3 @@ It is quite possible some files were removed (or renamed!) on `marcos` but not o
This will show files that are on `angela` and not on `marcos`. They could be new files that were only added on `angela`, so be careful! A manual analysis is necessary, but let's say you are certain those files are not relevant anymore, you can delete them from `angela`: This will show files that are on `angela` and not on `marcos`. They could be new files that were only added on `angela`, so be careful! A manual analysis is necessary, but let's say you are certain those files are not relevant anymore, you can delete them from `angela`:
git annex drop <file> git annex drop <file>
If the file is a renamed or modified version from the original, you may need to use `--force`, but be careful! If you delete the wrong file, it will be lost forever!
> (!) Maybe this wouldn't happen with [[direct mode]] and an fsck? --[[anarcat]]

8
doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex/comment_2_c6c11a9d5f9f136fa541404cdc49f45c._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2022-10-31T16:09:12Z"
content="""
Indeed, you will need to use `git-annex sync --allow-unrelated-histories`
now in that situation. I have updated the tip.
"""]]