Le 10/03/2014 18:47, Kevin Lyda a écrit : > On Mon, Mar 10, 2014 at 5:24 PM, Bruce Dubbs <bruce.du...@gmail.com> 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 know the quilt commands > for doing this, but with git you have several options.
Since Matthew introduced me to quilt, I believed you were using it too. quilt allows you to generate patches. Basically, it records the file you want to modify before you modify it ("quilt add"), then it generates a patch when you are done with the modification ("quilt refresh"). You can "quilt add" several files to a given patch. You can revert the patch with "quilt pop", reapply with "quilt push". It is specially useful when working on general.ent: when you want to test a new version, you need to modify general.ent. Then somebody else modifies it on the repo, then you "quilt pop", "svn up", "quilt push", so that the patch is always against the latest general.ent. Pierre -- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page