FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Debian > Debian Development

 
 
LinkBack Thread Tools
 
Old 05-31-2011, 07:18 AM
Goswin von Brederlow
 
Default patch splitter

Joachim Breitner <nomeata@debian.org> writes:

> Hi,
>
> Am Sonntag, den 29.05.2011, 11:26 +0200 schrieb Josselin Mouette:
>> > But it still happens that those patches are generated[1] when the maintainer
>> > did not expect any change at all. That's why we added the option
>> > --abort-on-upstream-changes for maintainers who never wants dpkg-source
>> > to auto-create a patch.
>> >
>> > I wonder if I should not make this option the default
>>
>> Yes please.
>
> Iā??m ok with it, as long as the unexpected changes are put in a patch
> file, either in /tmp or some location cleaned by dpkg-buildpackage, so
> if I want the change I can just move it into debian/patches with an
> appropriate name.
>
> Basically avoiding yet another call to dpkg-buildpackage
> (--record-changes or something) just to get the patch in place.
>
> I often run dpkg-buildpackage -S just with the intention of recording my
> changes as a patch, as that is more convenient to run "quilt new ...;
> quilt add ..." _before_ doing the changes.
>
> 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.

MfG
Goswin


--
To UNSUBSCRIBE, email to debian-devel-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 87sjrv8hiw.fsf_-_@frosties.localnet">http://lists.debian.org/87sjrv8hiw.fsf_-_@frosties.localnet
 
Old 05-31-2011, 10:17 AM
Joachim Breitner
 
Default patch splitter

Hi,

Am Dienstag, den 31.05.2011, 09:18 +0200 schrieb Goswin von Brederlow:
> Joachim Breitner <nomeata@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

--
Joachim "nomeata" Breitner
Debian Developer
nomeata@debian.org | ICQ# 74513189 | GPG-Keyid: 4743206C
JID: nomeata@joachim-breitner.de | http://people.debian.org/~nomeata
 
Old 05-31-2011, 01:50 PM
Goswin von Brederlow
 
Default patch splitter

Joachim Breitner <nomeata@debian.org> writes:

> Hi,
>
> Am Dienstag, den 31.05.2011, 09:18 +0200 schrieb Goswin von Brederlow:
>> Joachim Breitner <nomeata@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-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 87vcwr6kti.fsf@frosties.localnet">http://lists.debian.org/87vcwr6kti.fsf@frosties.localnet
 

Thread Tools




All times are GMT. The time now is 07:05 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright ©2007 - 2008, www.linux-archive.org