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

still bug with sync in adjusted branch

Browse source
This commit is contained in:
Joey Hess 2016-04-04 13:55:15 -04:00
parent 7c7f3a0f76
commit 1720f9f851
Failed to extract signature
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
doc/design/adjusted_branches.mdwn
View file

@ -351,6 +351,32 @@ into adjusted view worktrees.]
will make copies of the content of annexed files, so this would need will make copies of the content of annexed files, so this would need
to checkout the adjusted branch some other way. Maybe generalize so this to checkout the adjusted branch some other way. Maybe generalize so this
more efficient checkout is available as a git-annex command? more efficient checkout is available as a git-annex command?
* sync in adjusted branch can trigger merge conflict detection where
there should be no conflict.
git init a
cd a
git annex init --version=6
touch f
git annex add f
git annex sync
cd ..
git clone a b
cd b
git annex init --version=6
git annex adjust --unlock
cd ..
cd a
git mv f f2
git annex sync
cd ..
cd b
git annex sync
* There are potentially races in code that assumes a branch like * There are potentially races in code that assumes a branch like
master is not being changed by someone else. In particular, master is not being changed by someone else. In particular,
propigateAdjustedCommits rebases the adjusted branch on top of master. propigateAdjustedCommits rebases the adjusted branch on top of master.