Pierre Labastie wrote:
> Just a few more notes about my experience about subversion and git > (more limited for the latter): > - about branching and merging: I created a branch with subversion > for the BLFS part of jhalfs. After moving directories around, I couldnot > merge anymore from the trunk, because the different tree layout > confused the merge. I had to cherry pick revisions from trunk to > branch, and that was just doubling the work. When I merged > everything at the end, it took quite a while to get everything right. > Of course, git is much better in this respect. > > - I think the workflow associated to git is roughly analogous to > subversion+quilt: > svn co <--> git clone > svn up <--> git pull > quilt new <something> <--> git checkout -b <something> > (or nothing if working on the master branch) > quilt add <file> <--> git add <file> > (do it before editingfor quilt, after for git). > quilt pop <--> git checkout master > (or git stash save(master branch) > quilt push <--> git checkout <something> > (or git stash apply (master branch)) > svn ci <--> git checkout master > + git merge + git commit + git push > (or just git commit + git push (master branch)) Pierre, I'm not familiar with quilt. Can you explain? -- Bruce -- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
