Rev 1629: Make push and pull converge. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1629
revision-id: pqm at pqm.ubuntu.com-20060412061132-beffbe6feb9bc734
parent: pqm at pqm.ubuntu.com-20060412032139-5508773d6a1cd4ae
parent: robertc at robertcollins.net-20060412053532-74cf4362ebd83f29
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-12 07:11:32 +0100
message:
  Make push and pull converge.
added:
  bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
  bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
  bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
  tutorial.txt                   tutorial.txt-20050804190939-9dcbba2ef053bc84
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060412053532-74cf4362ebd83f29
    parent: robertc at robertcollins.net-20060412045734-3e03b7af0860a5a9
    parent: pqm at pqm.ubuntu.com-20060412032139-5508773d6a1cd4ae
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2006-04-12 15:35:32 +1000
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060412045734-3e03b7af0860a5a9
    parent: pqm at pqm.ubuntu.com-20060410052637-9c6229889bc13061
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2006-04-12 14:57:34 +1000
    message:
       * 'pull' and 'push' now normalise the revision history, so that any two
         branches with the same tip revision will have the same output from 'log'.
         (Robert Collins)