3rd party software customizations

[Cristiano Cortezia]

Em 17 de abril de 2012 02:24, Arne Babenhauserheide <arne_bab at web.de>escreveu:

> Hi Cristiano,
>
> Am Montag, 16. April 2012, 21:29:08 schrieb Cristiano Cortezia:
> > The main problem arises, of course, after the library provider releases a
> > new version of their code, and these changes must be mixed to the local
> > changes.
>
> I did that once and I used a simple vendor-branch. Every new release
> landed in
> the vendor branch and got then merged into default. The main problem was,
> that
> I sometimes got conflicts between my own changes and upstream changes. But
> that can’t really be avoided…
>
> If the upstream library has a Mercurial repository, I would rather use a
> personal branch for my changes and leave the upstream repo structure
> intact.
>
> Best wishes,
> Arne
> --
> singing a part of the history of free software:
>
> - http://infinite-hands.draketo.de
>
>
Thanks for your prompt response.
I have one more question, regarding this subject. How do you proceed when
it is not desirable to accept the whole new vendor release, but to pick
only some of the changes to your customization branch (i.e. taking
bugfixes while leaving new features unmerged) ?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20120417/b7858ee6/attachment-0002.html>