Ubuntu distributed development: which merge command

[Jelmer Vernooij]

On 22/07/11 03:35, Kyle Nitzsche wrote:
> When merging your approved branch into your pristine local trunk, the  
> documentation [1] says to use 'bzr merge-package'. What does this do 
> that  'bzr merge' does not do?
See the help for merge-package ("bzr help merge-package"):

   This will first check whether the upstream branches have diverged.

   If that's the case an attempt will be made to fix the upstream ancestry
   so that the user only needs to deal with packaging branch merge issues.

   In the opposite case a normal merge will be performed.

The eventual goal is to make the fixup code in merge-package merely hook 
into the regular merge command, and to remove the merge-package command.

Cheers,

Jelmer