Rev 2485: merge bzr.dev at 2480 in file:///v/home/vila/src/bugs/111702/

Vincent Ladeuil v.ladeuil+lp at free.fr
Thu May 3 22:29:46 BST 2007


At file:///v/home/vila/src/bugs/111702/

------------------------------------------------------------
revno: 2485
revision-id: v.ladeuil+lp at free.fr-20070503212944-naxq1qsq297uxauz
parent: v.ladeuil+lp at free.fr-20070503212714-3sbdmehsv8kemomw
parent: pqm at pqm.ubuntu.com-20070503194912-pzlcms91kk2uqfdo
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Thu 2007-05-03 23:29:44 +0200
message:
  merge bzr.dev at 2480
added:
  doc/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
modified:
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
  doc/default.css                default.css-20060622101119-tgwtdci8z769bjb9-1
    ------------------------------------------------------------
    revno: 2476.1.4
    merged: pqm at pqm.ubuntu.com-20070503194912-pzlcms91kk2uqfdo
    parent: pqm at pqm.ubuntu.com-20070503192218-gq01rpszgraa681p
    parent: john at arbash-meinel.com-20070502152116-cli5do15pznxvl9g
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-05-03 20:49:12 +0100
    message:
      (John Arbash Meinel) Add doc/shared_repository_layouts.txt
        ------------------------------------------------------------
        revno: 2476.2.1
        merged: john at arbash-meinel.com-20070502152116-cli5do15pznxvl9g
        parent: pqm at pqm.ubuntu.com-20070502125159-zpnij2o99tlddedp
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: shared_repo_layouts
        timestamp: Wed 2007-05-02 10:21:16 -0500
        message:
          Add shared_repository_layouts.txt as a core document.
    ------------------------------------------------------------
    revno: 2476.1.3
    merged: pqm at pqm.ubuntu.com-20070503192218-gq01rpszgraa681p
    parent: pqm at pqm.ubuntu.com-20070503094732-4ypcrctuxb93rwcv
    parent: john at arbash-meinel.com-20070502145420-k2vebnl0rd45q8kk
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-05-03 20:22:18 +0100
    message:
      (John Arbash Meinel) Fix bug #75721: 'bzr push' should only connect a single time.
    ------------------------------------------------------------
    revno: 2476.1.2
    merged: pqm at pqm.ubuntu.com-20070503094732-4ypcrctuxb93rwcv
    parent: pqm at pqm.ubuntu.com-20070503064943-wh3ls1tw3q2awye0
    parent: bialix at ukr.net-20070501090918-km46cslj820tiyzl
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-05-03 10:47:32 +0100
    message:
      (bialix,r=john,martin) Bugfix #110901: commit message template written
       with native line-endings; corresponding unit tests added
        ------------------------------------------------------------
        revno: 2472.4.2
        merged: bialix at ukr.net-20070501090918-km46cslj820tiyzl
        parent: bialix at ukr.net-20070430195244-pxc5r3x72ckh027e
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win32.fixes
        timestamp: Tue 2007-05-01 12:09:18 +0300
        message:
          unwrapping long lines in tests
        ------------------------------------------------------------
        revno: 2472.4.1
        merged: bialix at ukr.net-20070430195244-pxc5r3x72ckh027e
        parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win32.fixes
        timestamp: Mon 2007-04-30 22:52:44 +0300
        message:
          Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
    ------------------------------------------------------------
    revno: 2476.1.1
    merged: pqm at pqm.ubuntu.com-20070503064943-wh3ls1tw3q2awye0
    parent: pqm at pqm.ubuntu.com-20070502125159-zpnij2o99tlddedp
    parent: mbp at sourcefrog.net-20070503062149-mkf0na5ce8j3rpzm
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-05-03 07:49:43 +0100
    message:
      Integrated developer guide cleanups
    ------------------------------------------------------------
    revno: 2475.3.4
    merged: mbp at sourcefrog.net-20070503062149-mkf0na5ce8j3rpzm
    parent: mbp at sourcefrog.net-20070503061911-1mmho1eh1pz7y950
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: doc
    timestamp: Thu 2007-05-03 16:21:49 +1000
    message:
      HACKING rest fixes from jam
    ------------------------------------------------------------
    revno: 2475.3.3
    merged: mbp at sourcefrog.net-20070503061911-1mmho1eh1pz7y950
    parent: mbp at sourcefrog.net-20070503061300-db7vcrdh10vhhqih
    parent: ian.clatworthy at internode.on.net-20070502044327-uvny1xwti20eh1p3
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: doc
    timestamp: Thu 2007-05-03 16:19:11 +1000
    message:
      Merge ian's HACKING updates
        ------------------------------------------------------------
        revno: 2466.6.3
        merged: ian.clatworthy at internode.on.net-20070502044327-uvny1xwti20eh1p3
        parent: ian.clatworthy at internode.on.net-20070430081033-2uer1v88nhaz4532
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.HACKING
        timestamp: Wed 2007-05-02 14:43:27 +1000
        message:
          Incorporate feedback from Aaron B. & Alex B.
        ------------------------------------------------------------
        revno: 2466.6.2
        merged: ian.clatworthy at internode.on.net-20070430081033-2uer1v88nhaz4532
        parent: ian.clatworthy at internode.on.net-20070427150319-tldij8hy0tcsij2q
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.HACKING
        timestamp: Mon 2007-04-30 18:10:33 +1000
        message:
          Incorporate feedback from LarstiQ
        ------------------------------------------------------------
        revno: 2466.6.1
        merged: ian.clatworthy at internode.on.net-20070427150319-tldij8hy0tcsij2q
        parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.HACKING
        timestamp: Sat 2007-04-28 01:03:19 +1000
        message:
          Expand HACKING into Bazaar Developer Guide
    ------------------------------------------------------------
    revno: 2475.3.2
    merged: mbp at sourcefrog.net-20070503061300-db7vcrdh10vhhqih
    parent: mbp at sourcefrog.net-20070502113316-dshmmkjwwzjsyuq8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: doc
    timestamp: Thu 2007-05-03 16:13:00 +1000
    message:
      Clarify TestSkipped
    ------------------------------------------------------------
    revno: 2475.3.1
    merged: mbp at sourcefrog.net-20070502113316-dshmmkjwwzjsyuq8
    parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: doc
    timestamp: Wed 2007-05-02 21:33:16 +1000
    message:
      Description of how to use TestSkipped, test features, etc
-------------- next part --------------

Diff too large for email (1632 lines, the limit is 1000).


More information about the bazaar-commits mailing list