Feedback on merging via bzr

[David Strauss]

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
   | david at fourkitchens.com
Four Kitchens
   | http://fourkitchens.com
   | +1 512 454 6659 [office]
   | +1 512 870 8453 [direct]

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 259 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/ubuntu-distributed-devel/attachments/20100118/123d8fcb/attachment.pgp