[PATCH] New option to choose fast-forwarding on merge (take 2)

[Martin Pool]

Martin Pool has voted +1.
Status is now: Approved
Comment:
Since this only automates a pattern that people currently do manually, I think the danger is not too bad.  I think it will be interesting to see how people use this.

+                     Option('pull', help='If the branches are not diverged,'
+                            ' chage to remote revision as via pull command'),
+                     ]

s/chage/change/

Also I think this needs a bit more explanation, maybe:

  If the destination is already completely merged into the source, pull from the source rather than merging.  In this case there is no need to commit the result of the merge.

(Could be better, but somehow I think we need to communicate this.)

For details, see: http://bundlebuggy.aaronbentley.com/request/%3C20061125204030.GA15284%40efreet.light.src%3E