Joey Hess
442202dd6d
add a new useful thing
2012-01-02 11:18:33 -04:00
http://www.joachim-breitner.de/
3aed5ff88a
Added a comment
2012-01-02 14:02:05 +00:00
bremner
6744c41024
Added a comment: afaict git annex normalizes urls on the client side.
2011-12-31 22:29:40 +00:00
Joey Hess
97d5789157
formatting
2011-12-31 15:18:29 -04:00
Joey Hess
4a57542688
update
2011-12-31 15:12:16 -04:00
Joey Hess
9b12701b9e
releasing version 3.20111231
2011-12-31 15:07:45 -04:00
Joey Hess
f165e4aa99
add section on syncing to the walkthrough
2011-12-31 14:50:40 -04:00
Joey Hess
dd41be54f9
Merge branch 'master' of ssh://git-annex.branchable.com
2011-12-31 14:34:46 -04:00
http://joey.kitenet.net/
68489c5cf2
Added a comment
2011-12-31 18:34:31 +00:00
Joey Hess
09905f6655
Merge branch 'autosync'
2011-12-31 14:32:59 -04:00
http://joey.kitenet.net/
38195a6363
Added a comment
2011-12-31 18:32:28 +00:00
Joey Hess
f0957426c5
skip local remotes that are not available (ie, not mounted)
...
With --fast, unavailable local remotes are filtered out of the fast set.
This way, if there are local remotes, --fast always acts only on them,
and if none are mounted, acts on nothing. This consistency is better
than --fast acting on different remotes depending on what's mounted.
2011-12-31 04:50:39 -04:00
Joey Hess
25e4b116c7
type alias
2011-12-31 04:19:10 -04:00
Joey Hess
ae6fcb853d
fix comment
2011-12-31 04:14:33 -04:00
Joey Hess
4a02c2ea62
type alias cleanup
2011-12-31 04:11:58 -04:00
Joey Hess
a2ec2d3760
refactor and check for a detached HEAD
2011-12-31 03:38:58 -04:00
Joey Hess
8a33573caf
better filtering out of special remotes
2011-12-31 03:27:37 -04:00
Joey Hess
6cd4c7efcd
never pick special remotes in --fast
...
even if they have the lowest cost, we cannot use them
2011-12-31 03:14:05 -04:00
Joey Hess
c61642ef0c
remove unnecessary check
...
mergeLocal always creates the local sync branch, so no need to check that
it exists later.
2011-12-31 03:08:44 -04:00
Joey Hess
aa64b8ceaf
refactor
2011-12-31 03:01:18 -04:00
Joey Hess
2998340abb
really fix check that remote needs merged
2011-12-31 02:45:12 -04:00
Joey Hess
9a7a77488e
tweak
2011-12-31 02:18:16 -04:00
Joey Hess
0396f9c795
tweak
2011-12-31 02:15:13 -04:00
Joey Hess
f2b584ad74
fix check that remote branch needs merged
2011-12-31 02:03:39 -04:00
Joey Hess
79231bcff0
minor cleanups
...
mergeFrom is never called on branches that don't exist anymore
2011-12-31 01:51:39 -04:00
Joey Hess
015a497914
avoid syncing remotes configured annex-ignore, unless explicitly specified
2011-12-31 01:42:42 -04:00
bremner
e073add830
Added a comment: ssh://gitolite-host/repo-name is supposed to work
2011-12-31 03:34:19 +00:00
bremner
db55fa1c07
Added a comment: gitolite gets different paths for different urls
2011-12-31 01:50:50 +00:00
Joey Hess
e7d3e546c2
sync --fast: Selects some of the remotes with the lowest annex.cost and syncs those, in addition to any specified at the command line.
2011-12-30 21:17:36 -04:00
Joey Hess
dd8451f0f8
update
2011-12-30 20:40:59 -04:00
Joey Hess
252376d639
Merge branch 'master' into autosync
2011-12-30 20:38:59 -04:00
Joey Hess
230bc8334b
typo
2011-12-30 20:30:36 -04:00
http://joey.kitenet.net/
133170fb23
Added a comment
2011-12-31 00:29:45 +00:00
Joey Hess
93700b14c9
Merge branch 'master' of ssh://git-annex.branchable.com
2011-12-30 20:22:36 -04:00
Joey Hess
435a349ef5
increate spec-constr-count
...
Was getting SpecConstr warnings on Command.Find
2011-12-30 20:20:25 -04:00
Joey Hess
8f4fdb3f97
Merge branch 'new-monad-control'
...
Conflicts:
debian/changelog
2011-12-30 20:08:01 -04:00
Joey Hess
b538f45faf
add a sync page documenting sync in detail
2011-12-30 20:02:55 -04:00
http://joey.kitenet.net/
5a2a515fff
Added a comment
2011-12-30 23:45:58 +00:00
Joey Hess
34c89dc146
improve description of sync
2011-12-30 19:45:23 -04:00
Joey Hess
a31b7d93c8
push when git-annex branch changed
...
I was too heavy-handed in optimising away pushes
2011-12-30 19:38:46 -04:00
Joey Hess
79872e360e
automated syncing
...
Some changes to make automated syncing nicer. Merge from both the remote's
$branch and its synced/$branch; either could have new changes. Create
synced/$branch on the remote when pushing.
2011-12-30 19:24:57 -04:00
Joey Hess
dba8fc8a1c
export remoteList
2011-12-30 19:10:54 -04:00
Joey Hess
f6f7ee7131
automatically create the syncbranch
2011-12-30 18:52:24 -04:00
Joey Hess
14d16b77b3
refactor
2011-12-30 18:37:55 -04:00
Joey Hess
52104dae6f
refactor
2011-12-30 18:36:40 -04:00
Joey Hess
56488e807b
check that synced/master exists before trying to use it
...
and a nice error message if syncing is not set up yet
2011-12-30 18:19:45 -04:00
Joey Hess
f2fa29bf3b
check if branches are up-to-date before merging, pushing
...
This optimises away the need to run anything in some common cases.
It's particularly useful on push; no need to push if the tracking branch
we just pulled is the same as the branch we're going to push.
2011-12-30 18:04:01 -04:00
Joey Hess
9d85baa314
improve wording
2011-12-30 17:54:09 -04:00
http://joey.kitenet.net/
2260eca688
Added a comment
2011-12-30 21:49:07 +00:00
bremner
4610f28f17
Added a comment: repo name conventions?
2011-12-30 21:41:15 +00:00
