Merge/sync and update

Emmet Hikory emmet.hikory at
Tue Nov 27 03:47:55 GMT 2007

On Nov 27, 2007 12:26 PM, Miguel Ruiz <mruiz at> wrote:
> If you have to merge/sync a package and a new upstream version appears,
> how is the procedure: to merge/sync and update later or just update the
> package?

    It's really up to you.  If the upstream version doesn't have any
exciting features or bugfixes, you can just do the merge/sync.  If the
upstream version does have things you want, and you could do a sync,
it's easiest to use the Debian package as a basis for the upgrade
process.  If a merge is required, it is probably easiest to first
merge the Debian changes and then do the new upstream.  You'll only
want one changelog entry in the final candidate, but you may find it
easier to maintain a merge candidate source locally as a basis for the
upgrade (so that the merge doesn't need to be redone if something goes
wrong with the upgrade).


More information about the Ubuntu-motu-mentors mailing list