Joachim Breitner <nome...@debian.org> writes: > Hi, > > Am Dienstag, den 31.05.2011, 09:18 +0200 schrieb Goswin von Brederlow: >> Joachim Breitner <nome...@debian.org> writes: >> > BTW, for all who create patches this way and want to later split the >> > patch into two logically independent patches, I am creating an >> > interactive patch splitter based on the darcs UI (but only the UI, donât >> > worry): >> > http://www.joachim-breitner.de/blog/archives/425-ipatch,-the-interactive-patch-editor.html >> > (Packaging for Debian is pending, but of course a goal. Until then, >> > cabal-install will get it to your computer almost as easy as apt-get >> > install.) >> >> Does that include splitting out chunks of the patch and adding them to >> already existing patches? Sometimes I get a new patch file and some of >> the changes belong to an existing patch. It would be nice if one could >> move the relevant chunk directly into the right patch instead of first >> splitting and then merging. > > this feature is not planned directly, but something to think about. > Although I wonder if the complexity of that task is UI-wise not better > served by two steps (splitting and merging). > > Also, moving a hunk next to another patch, so that they can be merged, > can possibly cause conflicts to be resolved, which additionally > complicates the UI. > > It seems that there is no "quilt merge". That would indeed be useful. > > Greeting, > Joachim
Merging 2 patches that are next to each other in the queue is trivial. Merging when there are other patches inbetween indeed can cause a conflict. I think the GUI should try to merge and check for a conflict. If one arises then it should undo the merge and offer to just split instead. One can then quilt pop to the right patch and merge manually. I wouldn't spend too much time into trying to make the GUI smart enough to resolve conflicts. MfG Goswin -- To UNSUBSCRIBE, email to debian-devel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/87vcwr6kti.fsf@frosties.localnet