On 2010-01-18 03:45, Scott Kitterman wrote: > Text conflict in debian/changelog > 1 conflicts encountered. > The merge resulted in 1 conflicts. Please resolve these and commit the > changes > with "bzr commit". > > This gives me the proposed merge. The conflict in this case seems to occur > with every merge I try. The most recent Debian and Ubuntu debian/changelog > entries conflict with each other and the file has to be edited to move the > most > recent Debian entry above the most recent Ubuntu entry. Additionally, MoM > would create a stub changelog entry for the new merged package which was > quite > convenient. None of this additional work is difficult, but it is tedious and > seems ripe for automation.
At least for the changelog issue, Bazaar is moving forward with per-file conflict resolution hooks that will allow type-specific merge behavior for things like changelogs. -- David Strauss | da...@fourkitchens.com Four Kitchens | http://fourkitchens.com | +1 512 454 6659 [office] | +1 512 870 8453 [direct]
signature.asc
Description: OpenPGP digital signature
-- ubuntu-distributed-devel mailing list ubuntu-distributed-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
