[MERGE] pull converges
mbp at sourcefrog.net
Tue Apr 11 08:42:37 BST 2006
On 11/04/2006, at 12:05 PM, Robert Collins wrote:
> This patch alters pull to converge when possible.
> Specifically it:
> * deprecates branch.pullable_revisions[obsolete]
> * changes update_revisions to use the left-most available parents
> when applying perfect fit revisions
> This will preserve the revision history during --overwrite - so we get
> an identical branch - but will not do so when applying perfect fit
> revisions. In that case the revision history is regenerated from the
> repository using the left most parent.
> Its not an option to pull because I think we either want this, or we
> dont. If we do - the way to get experience with it is to just use it.
Yes, I agree, and +1 to put it in, except that it needs documentation
updates in NEWS, tutorial.txt and the help for pull.
I guess push should change to work the same way - perhaps that can
wait until we see if we like it for pull.
More information about the bazaar