Rev 1978: Merge trunk. in file:///data/jelmer/bzr-svn/trunk/

Jelmer Vernooij jelmer at samba.org
Tue Nov 18 02:10:28 GMT 2008


At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1978
revision-id: jelmer at samba.org-20081118021026-kyxafi9qv5939apf
parent: jelmer at samba.org-20081118020822-hlkr9288qvmu2mjb
parent: jelmer at samba.org-20081112214541-6cnv9bnlfxso3fl0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2008-11-18 03:10:26 +0100
message:
  Merge trunk.
    ------------------------------------------------------------
    revno: 1929.2.2
    revision-id: jelmer at samba.org-20081112214541-6cnv9bnlfxso3fl0
    parent: jelmer at samba.org-20081112125826-fcytgt8fud2yi2lr
    parent: jelmer at samba.org-20081112194951-iz3wwiqumckntcn1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2008-11-12 22:45:41 +0100
    message:
      Merge 0.5.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
      foreign/__init__.py            foreign.py-20080827193306-rxeku2c2obec90c4-1
      layout/standard.py             standard.py-20080909185308-vfoi9po1pzy6u4le-2
      log.py                         log.py-20080707143400-mxzjdllay5jhvnq1-1
      mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
      mapping2.py                    mapping.py-20080904055555-lw057kjuadn0r2ma-2
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
      revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
      revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
      tests/mapping3/__init__.py     __init__.py-20080831152358-oy04n53cpnh64aj6-1
      tests/mapping_implementations/test_repository.py test_repository.py-20080902013845-ity7d1ymye69sobm-2
      tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
      tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
      tests/test_log.py              test_log.py-20080707150233-jwwy10h0byik6jxj-1
      tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
      tests/test_revmeta.py          test_revmeta.py-20080903002416-q6u02e2hrc2oxa8h-1
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 1929.2.1
    revision-id: jelmer at samba.org-20081112125826-fcytgt8fud2yi2lr
    parent: jelmer at samba.org-20081112114218-nk0p9ll9hjmhz789
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2008-11-12 13:58:26 +0100
    message:
      Change version back to exp.
    modified:
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d



More information about the bazaar-commits mailing list