Rev 1453: Merge from jam-integration. in /home/robertc/source/baz/integration/

Robert Collins robertc at robertcollins.net
Wed Jan 25 05:54:14 GMT 2006


------------------------------------------------------------
revno: 1453
revision-id: robertc at robertcollins.net-20060125055408-decd09a9f3f91658
parent: robertc at robertcollins.net-20060125051006-40a8d9a16a765f79
parent: john at arbash-meinel.com-20060124191602-681e9da1f16e695e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-01-25 16:54:08 +1100
message:
  Merge from jam-integration.
added:
  bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
renamed:
  bzrlib/changeset.py => bzrlib/_changeset.py changeset.py-20050513021216-b02ab57fb9738913
  bzrlib/merge_core.py => bzrlib/_merge_core.py merge_core.py-20050513021216-eda88728698d4401
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
  bzrlib/tests/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
  bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
  bzrlib/tests/test_status.py    teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/_merge_core.py          merge_core.py-20050513021216-eda88728698d4401
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060124191602-681e9da1f16e695e
    parent: john at arbash-meinel.com-20060124161142-546e0937e4d41f13
    parent: abentley at panoramicfeedback.com-20060124153355-8d91160257425086
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Tue 2006-01-24 13:16:02 -0600
    message:
      [merge] bzr.ab: Make merge internals private.
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060124153355-8d91160257425086
    parent: abentley at panoramicfeedback.com-20060123181322-30c089803263530b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Tue 2006-01-24 10:33:55 -0500
    message:
      Fixed up non-absolute imports
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060123181322-30c089803263530b
    parent: abentley at panoramicfeedback.com-20060123144949-0ec7474cc54bd4d2
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Mon 2006-01-23 13:13:22 -0500
    message:
      Moved merge.merge to builtins
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060123144949-0ec7474cc54bd4d2
    parent: aaron.bentley at utoronto.ca-20060122175648-4627d7fec6ad721c
    parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Mon 2006-01-23 09:49:49 -0500
    message:
      Dirty merge from mainline
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060122175648-4627d7fec6ad721c
    parent: abentley at panoramicfeedback.com-20060120142258-9d09d6ff707ebd1f
    parent: mbp at sourcefrog.net-20060118082354-b28f3ecdecc245b2
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-01-22 12:56:48 -0500
    message:
      Merged mainline
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060120142258-9d09d6ff707ebd1f
    parent: aaron.bentley at utoronto.ca-20060118015458-ba73c07352e1af17
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Fri 2006-01-20 09:22:58 -0500
    message:
      Removed _merge, renamed MergeConflictHandler to _MergeConflictHandler
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060118015458-ba73c07352e1af17
    parent: aaron.bentley at utoronto.ca-20060118015327-fa38a0453f973320
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-01-17 20:54:58 -0500
    message:
      More PEP8 fixes
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060118015327-fa38a0453f973320
    parent: aaron.bentley at utoronto.ca-20060118014518-b39b5e04f9d6d3c3
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-01-17 20:53:27 -0500
    message:
      PEP8 fixes
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060118014518-b39b5e04f9d6d3c3
    parent: abentley at panoramicfeedback.com-20060117214005-4ca4d0b6dc86f1d6
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-01-17 20:45:18 -0500
    message:
      Updated following j-a-meinel's comments
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060117214005-4ca4d0b6dc86f1d6
    parent: abentley at panoramicfeedback.com-20060117210942-353e1f1c77a1b6b4
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Tue 2006-01-17 16:40:05 -0500
    message:
      Oops.  Forgot _merge.py
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060117210942-353e1f1c77a1b6b4
    parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab
    timestamp: Tue 2006-01-17 16:09:42 -0500
    message:
      Made the merge internals private
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060124161142-546e0937e4d41f13
    parent: john at arbash-meinel.com-20060123152612-7bd1aa62799600e4
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Tue 2006-01-24 10:11:42 -0600
    message:
      [patch] Aaron Bentley: make revert work in a subdirectory.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060123152612-7bd1aa62799600e4
    parent: john at arbash-meinel.com-20060120193409-1466a4908863d28f
    parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-integration
    timestamp: Mon 2006-01-23 09:26:12 -0600
    message:
      [merge] bzr.dev 1524



More information about the bazaar-commits mailing list