Rev 1745: (robertc, jelmer)Merge the new ControlFormat core logic to support .hg, .svn etc formats. (Robert Collins, Jelmer Vernooij) in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1745
revision-id: pqm at pqm.ubuntu.com-20060613170241-91efacfc55c6b9d2
parent: pqm at pqm.ubuntu.com-20060613130303-e9de5dbda2e80da6
parent: robertc at robertcollins.net-20060613162609-779ae11bd22b2866
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-06-13 18:02:41 +0100
message:
  (robertc, jelmer)Merge the new ControlFormat core logic to support .hg, .svn etc formats. (Robert Collins, Jelmer Vernooij)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060613162609-779ae11bd22b2866
    parent: pqm at pqm.ubuntu.com-20060613130303-e9de5dbda2e80da6
    parent: jelmer at samba.org-20060613150406-fb8b663191b0bd2a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2006-06-14 02:26:09 +1000
    message:
      Merge the new ControlFormat core logic to support .hg, .svn etc formats. (Robert Collins, Jelmer Vernooij)
    ------------------------------------------------------------
    merged: jelmer at samba.org-20060613150406-fb8b663191b0bd2a
    parent: jelmer at samba.org-20060613135748-c2a2cbc8444fc809
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: non-bzr-control-dirs
    timestamp: Tue 2006-06-13 17:04:06 +0200
    message:
      Change set of control dir formats to list.
    ------------------------------------------------------------
    merged: jelmer at samba.org-20060613135748-c2a2cbc8444fc809
    parent: jelmer at samba.org-20060613132440-24e222a86f948f60
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: non-bzr-control-dirs
    timestamp: Tue 2006-06-13 15:57:48 +0200
    message:
      Fix a couple of minor issues after review by Martin. 
      Fix doctests.
    ------------------------------------------------------------
    merged: jelmer at samba.org-20060613132440-24e222a86f948f60
    parent: robertc at robertcollins.net-20060601061200-d242f0a952014f17
    parent: pqm at pqm.ubuntu.com-20060613020441-b1038ac438997a41
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: non-bzr-control-dirs
    timestamp: Tue 2006-06-13 15:24:40 +0200
    message:
      [merge] bzr.dev
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060601061200-d242f0a952014f17
    parent: robertc at robertcollins.net-20060530130237-68b9ae68a12848ee
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: hg-repo
    timestamp: Thu 2006-06-01 16:12:00 +1000
    message:
      Cosmetic niceties for debugging, extra comments etc.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060530130237-68b9ae68a12848ee
    parent: robertc at robertcollins.net-20060530124944-2448781ea0a5e892
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: hg-repo
    timestamp: Tue 2006-05-30 23:02:37 +1000
    message:
      Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060530124944-2448781ea0a5e892
    parent: robertc at robertcollins.net-20060530124726-1452571a34787c78
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: hg-repo
    timestamp: Tue 2006-05-30 22:49:44 +1000
    message:
      bugfix test for non .bzrdir support.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060530124726-1452571a34787c78
    parent: pqm at pqm.ubuntu.com-20060529231516-cad98b5042ea75f3
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: hg-repo
    timestamp: Tue 2006-05-30 22:47:26 +1000
    message:
      Support non '.bzr' control directories in bzrdir.