diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-05-31 15:30:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-05-31 15:30:30 -0400 |
| commit | 8a0a07ab100d5db384eb1039ed821c16698d47ba (patch) | |
| tree | f3d9660e67d000273f2638b769a7eb54d1844a18 | |
| parent | 6ea9a88ede48fa6d37a0ac476ca775c0edaa56a4 (diff) | |
| parent | cbace05372b05d0b7a73561e497edcae9b4abd6d (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
2 files changed, 19 insertions, 0 deletions
diff --git a/doc/tips/what_to_do_when_you_lose_a_repository/comment_1_cf19b8dc304dc37c26717174c4a98aa4._comment b/doc/tips/what_to_do_when_you_lose_a_repository/comment_1_cf19b8dc304dc37c26717174c4a98aa4._comment new file mode 100644 index 000000000..a7fce26ef --- /dev/null +++ b/doc/tips/what_to_do_when_you_lose_a_repository/comment_1_cf19b8dc304dc37c26717174c4a98aa4._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="http://dlaxalde.myopenid.com/" + nickname="dl" + subject="comment 1" + date="2012-05-31T14:36:33Z" + content=""" +Is there a way to have git-annex completely ignore a repository? I see that +the `dead` command adds the uuid of the repository to `trust.log` but does +not change `uuid.log`. Is it enough to remove the corresponding line in +`uuid.log` and `trust.log`? +"""]] diff --git a/doc/tips/what_to_do_when_you_lose_a_repository/comment_3_fa9ca81668f5faebf2f61b10f82c97d2._comment b/doc/tips/what_to_do_when_you_lose_a_repository/comment_3_fa9ca81668f5faebf2f61b10f82c97d2._comment new file mode 100644 index 000000000..a8d044c28 --- /dev/null +++ b/doc/tips/what_to_do_when_you_lose_a_repository/comment_3_fa9ca81668f5faebf2f61b10f82c97d2._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.153.8.243" + subject="comment 3" + date="2012-05-31T17:01:37Z" + content=""" +`dead` is the best we can do. The automatic merging used on the git-annex branch tends to re-add lines that are deleted in one repo when merging with another that still has them. +"""]] |