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

Added a comment

Browse source
This commit is contained in:
http://joey.kitenet.net/ 2011-12-14 17:31:31 +00:00 committed by admin
parent 020c845058
commit 25a5f6664e
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
doc/forum/syncing_non-git_trees_with_git-annex/comment_1_7f9593bdfd95e4a8814e6cc5c44619e6._comment Normal file
View file

@ -0,0 +1,24 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 1"
date="2011-12-14T17:31:31Z"
content="""
This is an entirely reasonable way to go about it.
However, doing it this way causes files in B to always \"win\" -- If the same filename is in both repositories, with differing content, the version added in B will superscede the version from A. If A has a file that is not in B, a git commit -a in B will commit a deletion of that file.
I might do it your way and look at the changes in B before (or even after) committing them to see if files from A were deleted or changed.
Or, I might just instead keep B in a separate subdirectory in the repository, set up like so:
<pre>
mv b old_b
git clone a b
cd b
mv ../old_b .
git annex add old_b --exclude --not '*.avi'
</pre>
Or, a third way would be to commit A to a branch like branchA and B to a separate branchB, and not merge the branches at all.
"""]]