Re: [lfs-dev] LFS and Git

2014-03-10 Thread Pierre Labastie
Le 10/03/2014 18:47, Kevin Lyda a écrit : > On Mon, Mar 10, 2014 at 5:24 PM, Bruce Dubbs wrote: >> Pierre, I'm not familiar with quilt. Can you explain? > > It's a tool to ease working on branches and to generate patch sets in svn. > > One thing Pierre doesn't mention is using quilt to generate

Re: [lfs-dev] LFS and Git

2014-03-10 Thread Kevin Lyda
On Mon, Mar 10, 2014 at 5:24 PM, Bruce Dubbs wrote: > Pierre, I'm not familiar with quilt. Can you explain? It's a tool to ease working on branches and to generate patch sets in svn. One thing Pierre doesn't mention is using quilt to generate patches that can then be consumed upstream. I don't

Re: [lfs-dev] LFS and Git

2014-03-10 Thread Bruce Dubbs
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 trun

Re: [lfs-dev] LFS and Git

2014-03-10 Thread Kevin Lyda
On Mon, Mar 10, 2014 at 9:40 AM, Pierre Labastie wrote: > Q: Hmm. OK. And how do I get rid of my branch? > A: git branch -d my_branch Only if the commit that branch points to is in another branch/tag. To delete it if it would be unreferenced: git branch -D my_branch > Q: OK. And how do I g

Re: [lfs-dev] LFS and Git

2014-03-10 Thread Pierre Labastie
Le 10/03/2014 00:19, Bruce Dubbs a écrit : > I've been working trying to understand Git a little better and trying to > evaluate whether it is appropriate for LFS to migrate. > > What I've done is to copy the alfs repository to anduin and work with > that copy. > > Note to Pierre: nothing has been