Rev 1804: Harmonize branch.conf with bazaar.conf and locations.conf in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Jun 22 13:20:58 BST 2006


------------------------------------------------------------
revno: 1804
revision-id: pqm at pqm.ubuntu.com-20060622122057-232c5c88c5d6bf6d
parent: pqm at pqm.ubuntu.com-20060621145508-52a8077e9d1703de
parent: abentley at panoramicfeedback.com-20060621213506-e58c1f9dc1a6d6d2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-06-22 13:20:57 +0100
message:
  Harmonize branch.conf with bazaar.conf and locations.conf
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/sign_my_commits.py      sign_my_commits.py-20060215152201-5a6363365180e671
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060621213506-e58c1f9dc1a6d6d2
    parent: abentley at panoramicfeedback.com-20060621210920-e9fadec3d1b10d24
    parent: pqm at pqm.ubuntu.com-20060621145508-52a8077e9d1703de
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: foo
    timestamp: Wed 2006-06-21 17:35:06 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060621210920-e9fadec3d1b10d24
    parent: abentley at panoramicfeedback.com-20060621210904-985f2aae62ae90d0
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: foo
    timestamp: Wed 2006-06-21 17:09:20 -0400
    message:
      Deprecated Branch.tree_config
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060621210904-985f2aae62ae90d0
    parent: abentley at panoramicfeedback.com-20060621200802-3c2a9b19242c2d6a
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: foo
    timestamp: Wed 2006-06-21 17:09:04 -0400
    message:
      Added test that branch_config can't influence gpg_signing_command
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060621200802-3c2a9b19242c2d6a
    parent: abentley at panoramicfeedback.com-20060621192546-acf99aa9a3101354
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: foo
    timestamp: Wed 2006-06-21 16:08:02 -0400
    message:
      Add Branch.get_config, update BranchConfig() callers
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060621192546-acf99aa9a3101354
    parent: abentley at panoramicfeedback.com-20060620184001-83a6f4b38c9f15f9
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: foo
    timestamp: Wed 2006-06-21 15:25:46 -0400
    message:
      Add precedence test
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060620184001-83a6f4b38c9f15f9
    parent: abentley at panoramicfeedback.com-20060620181000-e297d286929064bf
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: foo
    timestamp: Tue 2006-06-20 14:40:01 -0400
    message:
      Set/get nickname using BranchConfig
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060620181000-e297d286929064bf
    parent: abentley at panoramicfeedback.com-20060620172736-6b36ad5a6d84239c
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: config
    timestamp: Tue 2006-06-20 14:10:00 -0400
    message:
      Ensure branch.conf works properly
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060620172736-6b36ad5a6d84239c
    parent: abentley at panoramicfeedback.com-20060617190145-c54d21563df3cf29
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: config
    timestamp: Tue 2006-06-20 13:27:36 -0400
    message:
      Integrate branch.conf into BranchConfig



More information about the bazaar-commits mailing list