Commit graph

28 commits

Author SHA1 Message Date
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
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
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
Joey Hess
3f8f534646
improve api, removing IO 2016-02-09 14:52:43 -04:00
Joey Hess
c85b774b2e
add RenameFile 2016-02-09 14:44:29 -04:00
Joey Hess
d09b742f48
update 2016-02-09 14:37:59 -04:00
Joey Hess
3188e5e4fe
update 2016-02-09 14:24:32 -04:00
Joey Hess
e4c85c856b
update 2016-02-09 13:51:49 -04:00
Joey Hess
1c9f4e81a6
update 2016-02-09 13:45:40 -04:00
Joey Hess
6dd9b2b63b
push details 2016-02-09 13:08:34 -04:00
Joey Hess
a7b3d8574e
commit details 2016-02-09 13:04:10 -04:00
Joey Hess
7a4e456662
integration with view branches 2016-02-09 12:45:48 -04:00
Joey Hess
09400f7bfb
stacking filters 2016-02-09 12:41:45 -04:00
Joey Hess
edc5829785
added adjusted_branches design doc, meets at least 2 different needs 2016-02-09 12:30:29 -04:00