Rev 2200: (Jan Hudec) Add a '--pull' option to 'merge' to switch to pull when possible. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2200
revision-id: pqm at pqm.ubuntu.com-20061219152658-bb9a7fc4dab5cdb1
parent: pqm at pqm.ubuntu.com-20061219081515-bf5fdee82b453ceb
parent: john at arbash-meinel.com-20061219141931-jhjpdy5hzgnr2b44
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-12-19 15:26:58 +0000
message:
  (Jan Hudec) Add a '--pull' option to 'merge' to switch to pull when possible.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061219141931-jhjpdy5hzgnr2b44
    parent: john at arbash-meinel.com-20061219141526-8rtwgx4iav2xvak5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-12-19 08:19:31 -0600
    message:
      Update documentation as per Martin's suggestion.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061219141526-8rtwgx4iav2xvak5
    parent: pqm at pqm.ubuntu.com-20061219081515-bf5fdee82b453ceb
    parent: bulb at ucw.cz-20061125203839-9nuhv32z63hb8811
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-12-19 08:15:26 -0600
    message:
      [merge] Jan Hudec's merge --pull patch
    ------------------------------------------------------------
    merged: bulb at ucw.cz-20061125203839-9nuhv32z63hb8811
    parent: pqm at pqm.ubuntu.com-20061123070038-57f13b951191257e
    committer: Jan Hudec <bulb at ucw.cz>
    branch nick: bzr.pointless-merges
    timestamp: Sat 2006-11-25 21:38:39 +0100
    message:
      Option --pull for merge command.
      
      Option --pull was added to merge command, that, if the merge would be
      trivial, ie. if the common ancestor is equal to the local tip, causes pull of
      the remote instead of creating the merger.
      
      Simple test for this option is included.