On Sat, 21 Jul 2012 20:22:56 +0200, Sascha Manns <[email protected]> wrote: > Hello Listmates, > > i've created now three patches in a Sourcefolder: one, two and three. > > First one is on top, then two and final three. Now three is on top. But how > can i go to one again?
Let's assume that "go to one" means you want to work with patch one, not necessarily making it the top patch. There are two cases: 1. Patches two and three do not have any conflicting changes (do not affect the same files) as patch one. 2. Patches two and three have conflicting changes: they apply changes on top of some of the same files as patch one. In case 1, it is possible to work with patch one even though the other two are applied. You can make a change to the files in patch one, and save the changes to that patch by refreshing that patch specifically. Use "quilt refresh one" to refresh patch one. In case 2, to work with patch one, you have to pop patches two and three with quilt pop. You can run "quilt pop" twice. Or, alternatively, you can run "quilt pop one" which will implicitly run "quilt pop" enough times until patch one is the top patch. This is how you "go to" patch one. But you end up with a working tree which knows nothing about patches two and three. In case 2, it is still possible to work with those files of patch one which are not affected by the higher patches. You can make some last minute change and force it into the patch without popping the others. You have to use the -f option of quilt refresh. Any changes in the conflicting files are assumed to belong to the higher patches; only changes in the non-conflicting files which are strictly in patch one will be refreshed into that patch. Cheers ... _______________________________________________ Quilt-dev mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/quilt-dev
