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

git-annex (5.20131127) unstable; urgency=low

Browse source 
* webapp: Detect when upgrades are available, and upgrade if the user
    desires.
    (Only when git-annex is installed using the prebuilt binaries
    from git-annex upstream, not from eg Debian.)
  * assistant: Detect when the git-annex binary is modified or replaced,
    and either prompt the user to restart the program, or automatically
    restart it.
  * annex.autoupgrade configures both the above upgrade behaviors.
  * Added support for quvi 0.9. Slightly suboptimal due to limitations in its
    interface compared with the old version.
  * Bug fix: annex.version did not get set on automatic upgrade to v5 direct
    mode repo, so the upgrade was performed repeatedly, slowing commands down.
  * webapp: Fix bug that broke switching between local repositories
    that use the new guarded direct mode.
  * Android: Fix stripping of the git-annex binary.
  * Android: Make terminal app show git-annex version number.
  * Android: Re-enable XMPP support.
  * reinject: Allow to be used in direct mode.
  * Futher improvements to git repo repair. Has now been tested in tens
    of thousands of intentionally damaged repos, and successfully
    repaired them all.
  * Allow use of --unused in bare repository.

# imported from the archive
This commit is contained in:
Joey Hess 2013-11-27 18:41:44 -04:00
commit 7189dfd77d
6383 changed files with 204042 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

33
doc/tips/centralized_git_repository_tutorial/comment_1_9072ebc0c61446d7b151fcfab616fea9._comment Normal file
View file

@ -0,0 +1,33 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkC0W3ZQERUaTkHoks6k68Tsp1tz510nGo"
nickname="Georg"
subject="sync, push, pull with/to/from centralized bare repository"
date="2013-10-07T06:45:19Z"
content="""
Hi Joey,
thanks for tutorial with the centralized repo. I am currently trying to set up a central bare repo for two clients (they cannot communicate directly with each other). I am not sure if I am pushing/pulling the right way.
On the server I did:
git init --bare
git annex init origin
On Cĺient Alice (I want to give Bob a chance get call \"git annex get\" from \"origin\"):
git clone ssh://tktest@192.168.56.104/~/annex .
git annex init Alice
git annex merge
git annex add .
git commit -a -m \"Added tutorial\"
git push origin master git-annex
git annex copy . --to origin
On Client Bob I have called \"clone, init, merge, add, push, copy\" also.
Now the tricky part - do I have to call \"git annex sync\" at Alice's side to get the updates from Bob over origin?
I ran into troubles if I called \"copy --to origin\" before \"git push origin master git-annex\". How can I resolve a non-fast-forware on the git-annex branch?
Some notes about how to sync over a central bare repo would be nice here =)
Thanks a lot, Georg
"""]]

8
doc/tips/centralized_git_repository_tutorial/comment_2_528e92b21f0551fde4adb956654953ae._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.253.80"
subject="How can I resolve a non-fast-forware on the git-annex branch?"
date="2013-10-07T17:08:32Z"
content="""
By either running `git annex sync`, or if you want to pull and push yourself, by running `git annex merge` before pushing.
"""]]