3rd party software customizations

[Kevin Bullock]

On 17 Apr 2012, at 6:38 AM, Cristiano Cortezia wrote:

> 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) ?

It's going to be somewhat painful.

One option would be to commit the new vendor release to the vendor branch, take the diff of that commit with its parent, and manually apply a hunk at a time to your custom branch.

Another option is to commit the new vendor release to the vendor branch, merge as normal with default, and then throw away the upstream changes you don't want _before committing the merge_.

Which method you choose probably depends on how many of the upstream changes you want. If you just want to cherry-pick a few bugfixes, the former is likely easier (if a bit fiddly).

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20120417/6c4c7982/attachment-0002.html>