Joey Hess
fdb6839cf7
update
2016-04-12 14:28:38 -04:00
Joey Hess
7d28110c68
fix master push overwrite race when updating adjusted branch, by maintaining basis ref
2016-04-09 14:12:25 -04:00
Joey Hess
cf06dac2b8
hard links on windows
...
* annex.thin and annex.hardlink are now supported on Windows.
* unannex --fast now makes hard links on Windows.
2016-04-08 15:25:32 -04:00
Joey Hess
251405eca2
avoid withWorkTreeRelated affecting annex symlink calculation
2016-04-08 14:24:00 -04:00
Joey Hess
64de6dcc74
one little bug..
2016-04-06 19:23:32 -04:00
Joey Hess
60bdffe43e
fix auto merge conflict resolution when doing out of tree merge for adjusted branch
2016-04-06 17:32:04 -04:00
Joey Hess
b9e4e2ba84
new method for merging changes into adjusted branch that avoids unncessary merge conflicts
...
Still needs work when there are actual merge conflicts.
2016-04-06 15:36:18 -04:00
szrc
08897ff3a2
Added a comment
2016-04-05 01:18:53 +00:00
Joey Hess
20d15f70dd
response
2016-04-04 16:21:30 -04:00
Joey Hess
eeb74958a3
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-04 15:44:16 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
953d3accdc
Clarified CHECKURL-MULTI syntax
2016-04-04 19:00:04 +00:00
Joey Hess
f78cbd9f0d
todo
2016-04-04 14:38:29 -04:00
Joey Hess
1720f9f851
still bug with sync in adjusted branch
2016-04-04 13:55:15 -04:00
Joey Hess
7c7f3a0f76
deal with cloning a repo that has an ajdusted branch checked out
2016-04-04 13:51:42 -04:00
Joey Hess
83ac453bc4
update
2016-04-04 13:26:33 -04:00
Joey Hess
17d71ded79
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-04 13:17:46 -04:00
Joey Hess
c3e0859846
Upgrading a direct mode repository to v6 has changed to enter an adjusted unlocked branch.
...
This makes the direct mode to v6 upgrade able to be performed in one clone
of a repository without affecting other clones, which can continue using v5
and direct mode.
2016-04-04 13:17:24 -04:00
szrc
f1b7f407ee
Added a comment: Local storage of creds
2016-04-04 03:59:02 +00:00
Joey Hess
b7d7cc858e
remove old bug
...
I just fixed this one today; it was not the problem I thought it was.
2016-03-31 18:56:30 -04:00
Joey Hess
12ddb6e8b2
fixed merging of changes from adjusted branch + a remote
2016-03-31 18:54:35 -04:00
Joey Hess
860602a1e6
made some progress on syncing adjusted branches, but still buggy
2016-03-31 14:56:10 -04:00
Joey Hess
f63b839763
todo
2016-03-29 18:03:02 -04:00
Joey Hess
4b4a3b0152
todo
2016-03-29 16:44:09 -04:00
Joey Hess
6301543c00
prevent git-annex adjust changing things out from under the daemon
2016-03-29 13:57:48 -04:00
Joey Hess
bcd2350fc7
update
2016-03-29 13:30:29 -04:00
Joey Hess
42b7ccc89f
git annex add in adjusted unlocked branch
...
Cached the current branch lookup just because it seems unnecessary overhead
to run an extra git command per add to query the current branch.
2016-03-29 13:26:06 -04:00
Joey Hess
4226ae1040
updae
2016-03-29 12:50:25 -04:00
Joey Hess
70e8d6860e
Merge branch 'master' into adjustedbranch
2016-03-29 11:07:40 -04:00
185.16.53.225
74fbef73c8
poll vote (Same as for regular git-annex. ~/annex/)
2016-03-24 16:01:43 +00:00
Joey Hess
3a86cdf3e6
comment
2016-03-14 16:39:39 -04:00
Joey Hess
7125a1fb27
rename files containing :
...
This is mostly to let the repo check out on windows w/o using cygwin's git.
But, bash completion is also crap with : , so ..
2016-03-12 12:57:18 -04:00
Joey Hess
7a01f60eed
update
2016-03-11 20:16:02 -04:00
Joey Hess
cc44813550
simplify
2016-03-11 20:12:31 -04:00
Joey Hess
b9184f69a7
improve propigation of commits from adjusted branches
...
Only reverse adjust the changes in the commit, which means that adjustments
do not need to be generally cleanly reversable.
For example, an adjustment can unlock all locked files, but does not need
to worry about files that were originally unlocked when reversing, because
it will only ever be run on files that have been changed. So, it's ok
if it locks all files when reversed, or even leaves all files as-is when
reversed.
2016-03-11 16:05:06 -04:00
Joey Hess
97e97dccda
Merge branch 'master' into adjustedbranch
2016-03-11 12:21:26 -04:00
Joey Hess
5716c39928
thought on reversing commits to adjusted branch
2016-03-04 11:31:26 -04:00
Joey Hess
cf24e9b892
working toward adjusted commit propigation
2016-03-03 16:19:09 -04:00
Joey Hess
91f37673df
can't checkout adjusted branch while index is still locked
...
There's a race here, but entering an adjusted branch for the first time is
not something to do when a commit is being made at the same time. Although,
may want to prevent the assistant from committing while entering the
adjusted branch.
2016-03-03 14:20:39 -04:00
Joey Hess
102229fc67
need to update master
2016-02-29 17:39:06 -04:00
Joey Hess
70e65db751
note a bug
2016-02-29 17:30:37 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
229db26e83
Added a comment: would it be possible to get a branch only with annexed content?
2016-02-25 03:04:26 +00:00
Joey Hess
2bf90c7b56
updates
2016-02-23 13:21:38 -04:00
Joey Hess
33f540a944
updates
2016-02-22 15:24:06 -04:00
Joey Hess
3ca171ef5c
updates
2016-02-22 13:04:02 -04:00
84.142.108.233
e7dc6b0211
poll vote (My phone (or MP3 player))
2016-02-17 18:04:23 +00:00
Joey Hess
0b7d8d44d9
update
2016-02-09 16:32:40 -04:00
Joey Hess
73cca6e8c1
update
2016-02-09 16:26:55 -04:00
Joey Hess
9df7743e70
cleanu
2016-02-09 15:11:10 -04:00
Joey Hess
4fc5c21b3f
simplify; no need for separate filter reversal function
2016-02-09 15:09:25 -04:00
Joey Hess
cd84944bc5
improve
2016-02-09 14:59:13 -04:00
