Rev 211: Merge from trunk. in /home/robertc/source/baz/plugins/bzrtools/storage/

Robert Collins robertc at robertcollins.net
Wed Jan 25 04:42:22 GMT 2006


------------------------------------------------------------
revno: 211
revision-id: robertc at robertcollins.net-20060125044221-f5e442cfe06ebb88
parent: robertc at robertcollins.net-20060125042559-a91883f716514784
parent: robertc at robertcollins.net-20051205071830-0fb068e539b30ab9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Wed 2006-01-25 15:42:21 +1100
message:
  Merge from trunk.
added:
  CREDITS                        CREDITS-20051108172407-d2b27c1fedc03c89
  branchhistory.py               ancestry.py-20051129154454-419cfcc7ab46eb80
  patches/                       patches-20051111174240-0730071d2269100a
  reweave_inventory.py           reweave_inventory.py-20051108164726-1e5e0934febac06e
modified:
  NEWS                           NEWS-20050607185005-1d99ddda6117a97e
  __init__.py                    __init__.py-20051019101947-f758f1a696725014
  baz_import.py                  baz_import.py-20050614155149-bd6a5b1bff67db25
  blackbox.py                    blackbox.py-20051024040435-607c5e197ca2b9d8
  bzrtools.py                    scriptlib.py-20050501073634-776a13caa8838cf4
  clean_tree.py                  clean_tree.py-20050827022328-5ba46e22d074695c
  dotgraph.py                    pastegraph.cgi-20050830145741-bd23322c9fd3ba65
  errors.py                      errors.py-20050809125241-fdfa00da24e88399
  fetch_ghosts.py                fetch_missing.py-20050903220502-5529ef03979a5b29
  graph.py                       graph.py-20050830163250-0e1e9231f278d221
  patch.py                       patch.py-20050911032635-0e10233a9e39ef63
  setup.py*                      setup.py-20051019190214-38b3a1652920bf7a
  shelf.py                       shelf.py-20050525150501-c9479ac0bac3d0f6
  shelf_tests.py                 tests.py-20051019130958-0edcded95321bddd
  shell.py                       shell.py-20051027040441-2911d8e8e5673742
  tests/test_baz_import.py       test_baz_import.py-20050907130235-b4060b7dfae6a3e6
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051205071830-0fb068e539b30ab9
    parent: robertc at robertcollins.net-20051204231419-4677956db751c579
    parent: aaron.bentley at utoronto.ca-20051203212510-189717b33bc68494
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: trunk
    timestamp: Mon 2005-12-05 18:18:30 +1100
    message:
      Merge from abentley.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051203212510-189717b33bc68494
    parent: aaron.bentley at utoronto.ca-20051203212302-4cd6acc6140ebfc6
    parent: aaron.bentley at utoronto.ca-20051203212142-2dad12fcec98a895
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools.baz2bzr
    timestamp: Sat 2005-12-03 16:25:10 -0500
    message:
      merged mainline
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051203212142-2dad12fcec98a895
    parent: abentley at panoramicfeedback.com-20051129163717-fd313b19ffabd87f
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sat 2005-12-03 16:21:42 -0500
    message:
      Fixed test case failure
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051129163717-fd313b19ffabd87f
    parent: abentley at panoramicfeedback.com-20051129161901-45074607ac3a37a6
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2005-11-29 11:37:17 -0500
    message:
      Print the last revision range in branch_history
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051129161901-45074607ac3a37a6
    parent: abentley at panoramicfeedback.com-20051129161344-3997ed0518fbdb2d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2005-11-29 11:19:01 -0500
    message:
      Updated help
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051129161344-3997ed0518fbdb2d
    parent: aaron.bentley at utoronto.ca-20051129024058-2583a0a9f5b3615d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2005-11-29 11:13:44 -0500
    message:
      Introduced branch-history command
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051129024058-2583a0a9f5b3615d
    parent: aaron.bentley at utoronto.ca-20051126000811-82d43e20670a2de8
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Mon 2005-11-28 21:40:58 -0500
    message:
      Adjusted to selftest -> tests change 
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051126000811-82d43e20670a2de8
    parent: abentley at panoramicfeedback.com-20051124165113-76977367c6f4dc34
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Fri 2005-11-25 19:08:11 -0500
    message:
      Adjusted to match API changes
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051124165113-76977367c6f4dc34
    parent: aaron.bentley at utoronto.ca-20051119202745-b32f58046c98c3cc
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Thu 2005-11-24 11:51:13 -0500
    message:
      Updated shelf help
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051119202745-b32f58046c98c3cc
    parent: abentley at panoramicfeedback.com-20051117163952-e916bbbc3580c727
    parent: aaron.bentley at utoronto.ca-20051119202318-949ba01504dc8b52
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sat 2005-11-19 15:27:45 -0500
    message:
      Merge API fixes
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051119202318-949ba01504dc8b52
    parent: aaron.bentley at utoronto.ca-20051116043952-407dc1f8d37fb8f1
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sat 2005-11-19 15:23:18 -0500
    message:
      Updates to match API changes
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051116043952-407dc1f8d37fb8f1
    parent: aaron.bentley at utoronto.ca-20051116010133-0a5577cfa42a2bbe
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Tue 2005-11-15 23:39:52 -0500
    message:
      Applied tabs_in_diff_filenames patch
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051116010133-0a5577cfa42a2bbe
    parent: aaron.bentley at utoronto.ca-20051111174312-1c627d82a07bf8fd
    parent: abentley at panoramicfeedback.com-20051115203636-805f0fa0edcf0fee
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Tue 2005-11-15 20:01:33 -0500
    message:
      Merge completions
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051115203636-805f0fa0edcf0fee
    parent: aaron.bentley at utoronto.ca-20051110214144-834e918cd2a88101
    parent: abentley at panoramicfeedback.com-20051115183419-54559bb4dcd71373
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools2
    timestamp: Tue 2005-11-15 15:36:36 -0500
    message:
      Merge prompt work
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051115183419-54559bb4dcd71373
    parent: abentley at panoramicfeedback.com-20051115181405-62626c6d828b32cc
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2005-11-15 13:34:19 -0500
    message:
      Got prompt and title working
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051115181405-62626c6d828b32cc
    parent: aaron.bentley at utoronto.ca-20051110214144-834e918cd2a88101
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2005-11-15 13:14:05 -0500
    message:
      Got completions working properly
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051110214144-834e918cd2a88101
    parent: aaron.bentley at utoronto.ca-20051110210815-b4617cd85b678c43
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Thu 2005-11-10 16:41:44 -0500
    message:
      Handled status code again
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051110210815-b4617cd85b678c43
    parent: aaron.bentley at utoronto.ca-20051110210419-a402638d94693825
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Thu 2005-11-10 16:08:15 -0500
    message:
      Fixed unshelve return code
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051110210419-a402638d94693825
    parent: aaron.bentley at utoronto.ca-20051110201527-8caa84ae529a1871
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Thu 2005-11-10 16:04:19 -0500
    message:
      Handled whitespace branch names better
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051110201527-8caa84ae529a1871
    parent: aaron.bentley at utoronto.ca-20051110201450-4d2dc02b79f4ac5b
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Thu 2005-11-10 15:15:27 -0500
    message:
      Added Daniel Silverstone to credits
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051110201450-4d2dc02b79f4ac5b
    parent: aaron.bentley at utoronto.ca-20051110144103-c00b5f969ec2f3de
    parent: daniel.silverstone at canonical.com-20051110200623-77479964cab3c166
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Thu 2005-11-10 15:14:50 -0500
    message:
      Merged fix from silverstone
    ------------------------------------------------------------
    merged: daniel.silverstone at canonical.com-20051110200623-77479964cab3c166
    parent: daniel.silverstone at canonical.com-20051110180820-6990ef6c382cd1c1
    committer: Daniel Silverstone <daniel.silverstone at canonical.com>
    timestamp: Thu 2005-11-10 15:06:23 -0500
    message:
      Fix up fetch_ghosts to lock the branches, and to invoke bzr fix if it fetches any ghosts into the tree
    ------------------------------------------------------------
    merged: daniel.silverstone at canonical.com-20051110180820-6990ef6c382cd1c1
    parent: daniel.silverstone at canonical.com-20051109151006-819d90059045e88e
    parent: aaron.bentley at utoronto.ca-20051110144103-c00b5f969ec2f3de
    committer: Daniel Silverstone <daniel.silverstone at canonical.com>
    timestamp: Thu 2005-11-10 13:08:20 -0500
    message:
      Merge in from aaron
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051110144103-c00b5f969ec2f3de
    parent: aaron.bentley at utoronto.ca-20051109204824-ad8771b15f74b6f6
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Thu 2005-11-10 09:41:03 -0500
    message:
      Handled cases where user supplies empty directories or branches
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051109204824-ad8771b15f74b6f6
    parent: aaron.bentley at utoronto.ca-20051109203048-d42db22f2657719a
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Wed 2005-11-09 15:48:24 -0500
    message:
      Renamed force-reweave-inventory to fix
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051109203048-d42db22f2657719a
    parent: aaron.bentley at utoronto.ca-20051108172419-80f4f57367e40dab
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Wed 2005-11-09 15:30:48 -0500
    message:
      Merged hardlink-safe force-reweave-inventory
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051108172419-80f4f57367e40dab
    parent: aaron.bentley at utoronto.ca-20051108171439-6835d23881be10b8
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Tue 2005-11-08 12:24:19 -0500
    message:
      Added CREDITS
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051108171439-6835d23881be10b8
    parent: aaron.bentley at utoronto.ca-20051107215221-daa14cb01c8027d8
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Tue 2005-11-08 12:14:39 -0500
    message:
      Added force-reweave-inventory from Daniel Silverstone
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051107215221-daa14cb01c8027d8
    parent: aaron.bentley at utoronto.ca-20051105142058-a407d332ebe6adbf
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Mon 2005-11-07 16:52:21 -0500
    message:
      Adjusted tests to handle error status 3
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051105142058-a407d332ebe6adbf
    parent: aaron.bentley at utoronto.ca-20051104231825-e1c079c6f517a0ee
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sat 2005-11-05 09:20:58 -0500
    message:
      Adjusted baz-import for bzrlib API changes
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051104231825-e1c079c6f517a0ee
    parent: aaron.bentley at utoronto.ca-20051103235142-ee0902aa51ee99ac
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Fri 2005-11-04 18:18:25 -0500
    message:
      Cherry-picked Robert's diff and push fixes
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051103235142-ee0902aa51ee99ac
    parent: aaron.bentley at utoronto.ca-20051103230704-e2cba0a6d0d409c3
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Thu 2005-11-03 18:51:42 -0500
    message:
      Fixed baz-import with unregistered ancestors
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051103230704-e2cba0a6d0d409c3
    parent: aaron.bentley at utoronto.ca-20051103225930-b60e83b119032648
    parent: abentley at panoramicfeedback.com-20051101145037-27ee4174a53eeef3
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Thu 2005-11-03 18:07:04 -0500
    message:
      Merged myself
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051101145037-27ee4174a53eeef3
    parent: abentley at panoramicfeedback.com-20051031201420-720eed618ef83c7a
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Tue 2005-11-01 09:50:37 -0500
    message:
      Improved completion in the middle of lines
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051031201420-720eed618ef83c7a
    parent: aaron.bentley at utoronto.ca-20051031054524-292328b623bd775c
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Mon 2005-10-31 15:14:20 -0500
    message:
      Added file completion when completing subcommands.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051031054524-292328b623bd775c
    parent: aaron.bentley at utoronto.ca-20051031054416-39215722a3933d13
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Mon 2005-10-31 00:45:24 -0500
    message:
      0.6.1 release
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051031054416-39215722a3933d13
    parent: abentley at panoramicfeedback.com-20051031020011-44ed20450771b69c
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Mon 2005-10-31 00:44:16 -0500
    message:
      Fixed spelling of detritus
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051031020011-44ed20450771b69c
    parent: aaron.bentley at utoronto.ca-20051030035119-7cda4f9164ea6449
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Sun 2005-10-30 21:00:11 -0500
    message:
      Fixed up setup.py
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051030035119-7cda4f9164ea6449
    parent: aaron.bentley at utoronto.ca-20051029045342-5b7a8ebf57e3f713
    parent: abentley at panoramicfeedback.com-20051029212955-132d343a64ac80bc
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sat 2005-10-29 23:51:19 -0400
    message:
      Merged latest changes
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051029212955-132d343a64ac80bc
    parent: abentley at panoramicfeedback.com-20051029184048-88c7e2e0fc56481f
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Sat 2005-10-29 17:29:55 -0400
    message:
      Switched to TreeDelta.has_changed
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051029184048-88c7e2e0fc56481f
    parent: abentley at panoramicfeedback.com-20051029184034-7e23d1735a9416f6
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Sat 2005-10-29 14:40:48 -0400
    message:
      Updated GPL notices
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051029184034-7e23d1735a9416f6
    parent: aaron.bentley at utoronto.ca-20051028022009-405aeaecbe992f11
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Sat 2005-10-29 14:40:34 -0400
    message:
      tweaked setup.py metadata
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051028022009-405aeaecbe992f11
    parent: abentley at panoramicfeedback.com-20051027151728-4c81bbe80663604c
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Thu 2005-10-27 22:20:09 -0400
    message:
      blacklisted 'shell' from completion
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051029045342-5b7a8ebf57e3f713
    parent: aaron.bentley at utoronto.ca-20051028054246-e50a4222030a8772
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sat 2005-10-29 00:53:42 -0400
    message:
      Release 0.6
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051028054246-e50a4222030a8772
    parent: aaron.bentley at utoronto.ca-20051028044336-a3ccb566548fc289
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Fri 2005-10-28 01:42:46 -0400
    message:
      Added *? to the list of tricky characters.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051028044336-a3ccb566548fc289
    parent: aaron.bentley at utoronto.ca-20051028041632-274e8630cef9a1e9
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Fri 2005-10-28 00:43:36 -0400
    message:
      Updated NEWS
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051028041632-274e8630cef9a1e9
    parent: aaron.bentley at utoronto.ca-20051028031625-aad040bd7217a4fa
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Fri 2005-10-28 00:16:32 -0400
    message:
      Got patch working with urls
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051028031625-aad040bd7217a4fa
    parent: aaron.bentley at utoronto.ca-20051028022009-405aeaecbe992f11
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Thu 2005-10-27 23:16:25 -0400
    message:
      Added locking to graph-ancestry
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051103225930-b60e83b119032648
    parent: abentley at panoramicfeedback.com-20051031201420-720eed618ef83c7a
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Thu 2005-11-03 17:59:30 -0500
    message:
      Handled the case where the first ancestor is in an unregistered archive.
    ------------------------------------------------------------
    merged: daniel.silverstone at canonical.com-20051109151006-819d90059045e88e
    parent: aaron.bentley at utoronto.ca-20051108172419-80f4f57367e40dab
    committer: Daniel Silverstone <daniel.silverstone at canonical.com>
    timestamp: Wed 2005-11-09 10:10:06 -0500
    message:
      Make force-reweave-inventory write the inventory out to a new file and rename it over the top for safety if the write function explodes horribly, we run out of room, someone ^Cs us at the wrong time, etc
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051111174312-1c627d82a07bf8fd
    parent: aaron.bentley at utoronto.ca-20051110214144-834e918cd2a88101
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Fri 2005-11-11 12:43:12 -0500
    message:
      Added patch for tab-in-patch-filename support
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051117163952-e916bbbc3580c727
    parent: aaron.bentley at utoronto.ca-20051116043952-407dc1f8d37fb8f1
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Thu 2005-11-17 11:39:52 -0500
    message:
      Added shell docstring
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051203212302-4cd6acc6140ebfc6
    parent: aaron.bentley at utoronto.ca-20051203204225-25678bc921de4fc1
    parent: abentley at panoramicfeedback.com-20051129163717-fd313b19ffabd87f
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools.baz2bzr
    timestamp: Sat 2005-12-03 16:23:02 -0500
    message:
      Merged mainline
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051203204225-25678bc921de4fc1
    parent: abentley at panoramicfeedback.com-20051121144351-0244872ccd1308f8
    parent: robertc at robertcollins.net-20051129001122-a315bd9d60053147
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools.baz2bzr
    timestamp: Sat 2005-12-03 15:42:25 -0500
    message:
      Merge from lifeless
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051129001122-a315bd9d60053147
    parent: robertc at robertcollins.net-20051128235237-3d925e725ba525a6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: trunk
    timestamp: Tue 2005-11-29 11:11:22 +1100
    message:
      Make work with integration again.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051128235237-3d925e725ba525a6
    parent: robertc at robertcollins.net-20051128081703-0b148bd903bf0f90
    parent: abentley at panoramicfeedback.com-20051121144351-0244872ccd1308f8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: trunk
    timestamp: Tue 2005-11-29 10:52:37 +1100
    message:
      Merge from Aaron.
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051121144351-0244872ccd1308f8
    parent: abentley at panoramicfeedback.com-20051121142935-96c67761f8d04a12
    parent: robertc at robertcollins.net-20051107203357-d01c8affdf24a8bc
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Mon 2005-11-21 09:43:51 -0500
    message:
      Merged changes from robertc
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051121142935-96c67761f8d04a12
    parent: aaron.bentley at utoronto.ca-20051110214313-e0faebb440ec3268
    parent: aaron.bentley at utoronto.ca-20051119202745-b32f58046c98c3cc
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Mon 2005-11-21 09:29:35 -0500
    message:
      Updated from mainline bzrtools
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051110214313-e0faebb440ec3268
    parent: aaron.bentley at utoronto.ca-20051110153024-47d369876a122ef0
    parent: aaron.bentley at utoronto.ca-20051110214144-834e918cd2a88101
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools.baz2bzr
    timestamp: Thu 2005-11-10 16:43:13 -0500
    message:
      Merged mainline
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051110153024-47d369876a122ef0
    parent: aaron.bentley at utoronto.ca-20051110151749-1c7d988327059acb
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools.baz2bzr
    timestamp: Thu 2005-11-10 10:30:24 -0500
    message:
      Fixed test case
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051110151749-1c7d988327059acb
    parent: aaron.bentley at utoronto.ca-20051110150311-d6064b05a10b5fe5
    parent: aaron.bentley at utoronto.ca-20051110144103-c00b5f969ec2f3de
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools.baz2bzr
    timestamp: Thu 2005-11-10 10:17:49 -0500
    message:
      Merged the bzrtools mainline
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051110150311-d6064b05a10b5fe5
    parent: aaron.bentley at utoronto.ca-20051028030102-eead1e484007de74
    parent: robertc at robertcollins.net-20051030145725-cf38f47717490dba
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools.baz2bzr
    timestamp: Thu 2005-11-10 10:03:11 -0500
    message:
      Merged the latest from lifeless
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051028030102-eead1e484007de74
    parent: abentley at panoramicfeedback.com-20051027211356-0d4699554bcfbc7b
    parent: robertc at robertcollins.net-20051027211245-dfc7157d594714ae
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Thu 2005-10-27 23:01:02 -0400
    message:
      Merged lifeless
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051204231419-4677956db751c579
    parent: robertc at robertcollins.net-20051129001122-a315bd9d60053147
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: trunk
    timestamp: Mon 2005-12-05 10:14:19 +1100
    message:
      Test in-branch continuations.



More information about the bazaar-commits mailing list