Rev 1713: Implement bundles in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Jun 3 21:18:37 BST 2006
------------------------------------------------------------
revno: 1713
revision-id: pqm at pqm.ubuntu.com-20060603201835-1c9a1725641ccd24
parent: pqm at pqm.ubuntu.com-20060603175000-f316b327830f0cb5
parent: aaron.bentley at utoronto.ca-20060603201131-518d5e8364931300
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-06-03 21:18:35 +0100
message:
Implement bundles
added:
bzrlib/bundle/ changeset-20051118044006-6b0674808389027e
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/old/ old-20051119041827-8f2417a9cc3b67f2
bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
bzrlib/bundle/read_bundle.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/ serializer-20051118175351-f2009a32b92d471d
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v07.py v06.py-20051119041339-ee43f97270b01823
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_patches_data/ testdata-20051118165023-2a824afbf661df53
bzrlib/tests/test_patches_data/diff diff-20050727183609-9547bd65f4263852
bzrlib/tests/test_patches_data/diff-2 diff2-20050923211548-17287840f74d2fdc
bzrlib/tests/test_patches_data/diff-3 diff3-20050923212659-68ab55b31cc4fbda
bzrlib/tests/test_patches_data/diff-4 diff4-20050923212659-e6258b676e52af3c
bzrlib/tests/test_patches_data/diff-5 diff5-20050923212659-1dbdca9bbca19d36
bzrlib/tests/test_patches_data/diff-6 diff6-20050923212838-76eb04444c53bd2a
bzrlib/tests/test_patches_data/insert_top.patch insert_top.patch-20050727183609-e6af827c94a307ca
bzrlib/tests/test_patches_data/mod mod-20050727183609-24466e3a1df04230
bzrlib/tests/test_patches_data/mod-2 mod2-20050923211548-23d80987e3e05d87
bzrlib/tests/test_patches_data/mod-3 mod3-20050923212659-60ec307d7640e4da
bzrlib/tests/test_patches_data/mod-4 mod4-20050923212659-55526b6d64a461f0
bzrlib/tests/test_patches_data/mod-5 mod5-20050923212659-07398968494d77e4
bzrlib/tests/test_patches_data/mod-6 mod6-20050923212838-b4714bdf676aef01
bzrlib/tests/test_patches_data/orig orig-20050727183609-2ed1d3e5f19e52c5
bzrlib/tests/test_patches_data/orig-2 orig2-20050923211548-214d1e672297561f
bzrlib/tests/test_patches_data/orig-3 orig3-20050923212659-0376c2550eaafa4e
bzrlib/tests/test_patches_data/orig-4 orig4-20050923212659-2fce4f1d43d5f67a
bzrlib/tests/test_patches_data/orig-5 orig5-20050923212659-1d6e8c7c9e8a0070
bzrlib/tests/test_patches_data/orig-6 orig6-20050923212838-25e4d5f68835c564
bzrlib/tests/test_patches_data/patchtext.patch patchtext.patch-20060530035059-m8nk8bkv7apxr2jc-1
modified:
TODO TODO-20050426050852-44d2ad9048dafbe9
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060603201131-518d5e8364931300
parent: aaron.bentley at utoronto.ca-20060603180846-9db52001bccf64ce
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-06-03 21:11:31 +0100
message:
Skip unicode changeset test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060603180846-9db52001bccf64ce
parent: aaron.bentley at utoronto.ca-20060603171851-6a9975bdaed6e658
parent: pqm at pqm.ubuntu.com-20060603175000-f316b327830f0cb5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-06-03 19:08:46 +0100
message:
Update from mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060603171851-6a9975bdaed6e658
parent: aaron.bentley at utoronto.ca-20060603162309-c975ca9ea9fea344
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-06-03 18:18:51 +0100
message:
Ensure that bundles are bytestrings
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060603162309-c975ca9ea9fea344
parent: aaron.bentley at utoronto.ca-20060603001032-cb1dd1fa97d06f74
parent: pqm at pqm.ubuntu.com-20060531063654-ad54f9b8f90f2dda
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-06-03 17:23:09 +0100
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060603001032-cb1dd1fa97d06f74
parent: abentley at panoramicfeedback.com-20060530155536-debaf5530f1090cb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-06-03 01:10:32 +0100
message:
Update the TODOs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060530155536-debaf5530f1090cb
parent: abentley at panoramicfeedback.com-20060530155333-2fd164d1cdf2afc3
parent: pqm at pqm.ubuntu.com-20060529231516-cad98b5042ea75f3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-30 11:55:36 -0400
message:
Merge from dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060530155333-2fd164d1cdf2afc3
parent: abentley at panoramicfeedback.com-20060530151812-0e3e9b78cc15a804
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-30 11:53:33 -0400
message:
Move BadBundle error (and subclasses) to errors.py
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060530151812-0e3e9b78cc15a804
parent: aaron.bentley at utoronto.ca-20060530035103-1828900762221412
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-30 11:18:12 -0400
message:
Rename changesets to revision bundles
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060530035103-1828900762221412
parent: aaron.bentley at utoronto.ca-20060530033931-0427847a8124ffe1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-29 23:51:03 -0400
message:
Removed confusing text from the test module
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060530033931-0427847a8124ffe1
parent: aaron.bentley at utoronto.ca-20060529230133-9c5dd582c8aed4d6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-29 23:39:31 -0400
message:
Provide errors from bzrlib.patches in bzrlib.errors
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060529230133-9c5dd582c8aed4d6
parent: aaron.bentley at utoronto.ca-20060529224025-c72739e50c8c6a3a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-29 19:01:33 -0400
message:
PEP8 updates
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060529224025-c72739e50c8c6a3a
parent: abentley at panoramicfeedback.com-20060526135001-afdf23a97f15e699
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-29 18:40:25 -0400
message:
Split the patch testing out into a separate file
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060526135001-afdf23a97f15e699
parent: abentley at panoramicfeedback.com-20060525203045-20e015ef84de77ed
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-26 09:50:01 -0400
message:
More cleanups
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060525203045-20e015ef84de77ed
parent: abentley at panoramicfeedback.com-20060525175625-c239c2e6526ffe6e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Thu 2006-05-25 16:30:45 -0400
message:
Clean-up, remove utf-8 pass-through calls
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060525175625-c239c2e6526ffe6e
parent: abentley at panoramicfeedback.com-20060525172051-0f7bca5bc11e4173
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Thu 2006-05-25 13:56:25 -0400
message:
Cleanups to prepare for review
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060525172051-0f7bca5bc11e4173
parent: abentley at panoramicfeedback.com-20060525171314-53d50ffcc34db055
parent: pqm at pqm.ubuntu.com-20060525092836-8e8381f8f4d69909
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Thu 2006-05-25 13:20:51 -0400
message:
Merge from dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060525171314-53d50ffcc34db055
parent: abentley at panoramicfeedback.com-20060525165336-1164215bd8ff2dcc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Thu 2006-05-25 13:13:14 -0400
message:
Move calculation of Testament sha1s to Testament
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060525165336-1164215bd8ff2dcc
parent: abentley at panoramicfeedback.com-20060525165049-7c042d3345ac4dbe
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Thu 2006-05-25 12:53:36 -0400
message:
Tweak entry-to-line spacing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060525165049-7c042d3345ac4dbe
parent: abentley at panoramicfeedback.com-20060525164018-bcd2286b694eb8a1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Thu 2006-05-25 12:50:49 -0400
message:
Default execute bit to no for new files, directories, symlinks
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060525164018-bcd2286b694eb8a1
parent: aaron.bentley at utoronto.ca-20060522182558-a5d0bd4953b5e075
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Thu 2006-05-25 12:40:18 -0400
message:
Ensure that StrictTestament handles execute bit differences
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060522182558-a5d0bd4953b5e075
parent: aaron.bentley at utoronto.ca-20060522172703-8d49310df83715d3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-22 14:25:58 -0400
message:
Handle last-modified changes on their own
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060522172703-8d49310df83715d3
parent: aaron.bentley at utoronto.ca-20060522062250-743727f207503374
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-22 13:27:03 -0400
message:
Introduce StrictTestament, get test failing for the right reasons
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060522062250-743727f207503374
parent: aaron.bentley at utoronto.ca-20060520230449-d519859507c0a6d7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-22 02:22:50 -0400
message:
Add test for last-changed special cases
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520230449-d519859507c0a6d7
parent: aaron.bentley at utoronto.ca-20060520225204-e282012c8890c760
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 19:04:49 -0400
message:
Add ghosts to TODO
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520225204-e282012c8890c760
parent: aaron.bentley at utoronto.ca-20060520225001-6ce1da89d8f70edd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 18:52:04 -0400
message:
What about signatures?
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520225001-6ce1da89d8f70edd
parent: aaron.bentley at utoronto.ca-20060520224626-c011196da233d0a6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 18:50:01 -0400
message:
Update TODO
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520224626-c011196da233d0a6
parent: aaron.bentley at utoronto.ca-20060520195436-d65b829b2d107b69
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 18:46:26 -0400
message:
Remove progress indicator from cset command for now
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520195436-d65b829b2d107b69
parent: aaron.bentley at utoronto.ca-20060520193152-dae335197912329b
parent: pqm at pqm.ubuntu.com-20060519081516-cd19bd125a53a4d2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 15:54:36 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520193152-dae335197912329b
parent: aaron.bentley at utoronto.ca-20060520193046-1b97e315576c901d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 15:31:52 -0400
message:
Fixed tabs
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520193046-1b97e315576c901d
parent: aaron.bentley at utoronto.ca-20060520192829-3817cefc83d5cf0b
parent: john.dong at gmail.com-20060519174952-448b99a00c08f4dc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 15:30:46 -0400
message:
Merged setup fix from jdong
------------------------------------------------------------
merged: john.dong at gmail.com-20060519174952-448b99a00c08f4dc
parent: john.dong at gmail.com-20060519174702-b29d15e9b920e057
committer: John Dong <john.dong at gmail.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 13:49:52 -0400
message:
Add another package to setup.py
------------------------------------------------------------
merged: john.dong at gmail.com-20060519174702-b29d15e9b920e057
parent: aaron.bentley at utoronto.ca-20060519120905-e96996d16777e5ea
committer: John Dong <john.dong at gmail.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 13:47:02 -0400
message:
Install changeset
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520192829-3817cefc83d5cf0b
parent: aaron.bentley at utoronto.ca-20060520192713-222c31d43523ee8f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 15:28:29 -0400
message:
Avoid writing executable bit for non-files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520192713-222c31d43523ee8f
parent: aaron.bentley at utoronto.ca-20060520180359-9d438ed7adcb4014
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 15:27:13 -0400
message:
Use elipsis to continue long meta lines
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520180359-9d438ed7adcb4014
parent: aaron.bentley at utoronto.ca-20060520175258-d1a320d0120d8b64
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 14:03:59 -0400
message:
Removed two-liner nested functions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520175258-d1a320d0120d8b64
parent: aaron.bentley at utoronto.ca-20060520170535-09e7050e1f4d22be
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 13:52:58 -0400
message:
Refactored action writing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520170535-09e7050e1f4d22be
parent: aaron.bentley at utoronto.ca-20060520163630-3125b8397c15da92
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 13:05:35 -0400
message:
Serialize all actions through the action object
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520163630-3125b8397c15da92
parent: aaron.bentley at utoronto.ca-20060520162020-92eda5cfc69c6846
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 12:36:30 -0400
message:
Start abstracting action line writing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520162020-92eda5cfc69c6846
parent: aaron.bentley at utoronto.ca-20060520061821-ce40b9e717e42a27
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 12:20:20 -0400
message:
Start using a standard action writer
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060520061821-ce40b9e717e42a27
parent: aaron.bentley at utoronto.ca-20060519221000-5646b3ebe4af970f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-20 02:18:21 -0400
message:
Fix normal merge case
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060519221000-5646b3ebe4af970f
parent: abentley at panoramicfeedback.com-20060519211004-87778c4b483e52cf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Fri 2006-05-19 18:10:00 -0400
message:
Update todo
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519211004-87778c4b483e52cf
parent: abentley at panoramicfeedback.com-20060519210642-5b05edaf21a8563b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 17:10:04 -0400
message:
Remove debug code
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519210642-5b05edaf21a8563b
parent: abentley at panoramicfeedback.com-20060519203709-04f80427ff5c00f5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 17:06:42 -0400
message:
Got binary files working for adds, renames, modifications
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519203709-04f80427ff5c00f5
parent: abentley at panoramicfeedback.com-20060519185005-c884556a44fe1d13
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 16:37:09 -0400
message:
Got first binary test passing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519185005-c884556a44fe1d13
parent: abentley at panoramicfeedback.com-20060519184423-e911cd02f263c070
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 14:50:05 -0400
message:
Restore path-orientation of ChangesetTree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519184423-e911cd02f263c070
parent: abentley at panoramicfeedback.com-20060519184116-cca2cf917d6ee982
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 14:44:23 -0400
message:
Remove old chatter
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519184116-cca2cf917d6ee982
parent: abentley at panoramicfeedback.com-20060519181326-2f5c498dc05490fd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 14:41:16 -0400
message:
Code cleanup
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519181326-2f5c498dc05490fd
parent: abentley at panoramicfeedback.com-20060519175509-c27d8aff0ff31e4b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 14:13:26 -0400
message:
Add progress bar for changeset generation
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519175509-c27d8aff0ff31e4b
parent: abentley at panoramicfeedback.com-20060519174033-e166070d2ae7262c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 13:55:09 -0400
message:
Updated the write_changeset optimization
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519174033-e166070d2ae7262c
parent: abentley at panoramicfeedback.com-20060519173603-bf19fffe3b30d25a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 13:40:33 -0400
message:
Reorganized test suite
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519173603-bf19fffe3b30d25a
parent: abentley at panoramicfeedback.com-20060519164739-4d0e8f7d54197bea
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 13:36:03 -0400
message:
Remove auto_commit stuff
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519164739-4d0e8f7d54197bea
parent: abentley at panoramicfeedback.com-20060519162332-da20bf9ed8c3ae23
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 12:47:39 -0400
message:
Get symlink modification, renames and deletion under test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519162332-da20bf9ed8c3ae23
parent: abentley at panoramicfeedback.com-20060519162120-7ed2a30c88ea2c83
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 12:23:32 -0400
message:
Got symlink adding working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519162120-7ed2a30c88ea2c83
parent: abentley at panoramicfeedback.com-20060519144854-a0a2c438b53fb5ac
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 12:21:20 -0400
message:
Regularized extra_info a bit
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519144854-a0a2c438b53fb5ac
parent: abentley at panoramicfeedback.com-20060519141336-06c4a95798363efc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 10:48:54 -0400
message:
Swap meaning of two-argument 'changeset' to match 'merge'
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519141336-06c4a95798363efc
parent: abentley at panoramicfeedback.com-20060519141247-e8a51e5335239291
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 10:13:36 -0400
message:
Moved stuff around
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519141247-e8a51e5335239291
parent: abentley at panoramicfeedback.com-20060519134833-8930379043b36784
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 10:12:47 -0400
message:
Update TODO
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519134833-8930379043b36784
parent: abentley at panoramicfeedback.com-20060519134441-ff9b80921aef8bdf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 09:48:33 -0400
message:
Remove more unused code
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519134441-ff9b80921aef8bdf
parent: abentley at panoramicfeedback.com-20060519131650-ebc6783654deae57
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 09:44:41 -0400
message:
Remove unused functionality
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060519131650-ebc6783654deae57
parent: aaron.bentley at utoronto.ca-20060519120905-e96996d16777e5ea
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-19 09:16:50 -0400
message:
Update todo list
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060519120905-e96996d16777e5ea
parent: abentley at panoramicfeedback.com-20060517161513-55a87bb608a1583c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Fri 2006-05-19 08:09:05 -0400
message:
Move message to top, revision-id to footer
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060517161513-55a87bb608a1583c
parent: abentley at panoramicfeedback.com-20060517160321-35d3fd51d26eff74
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Wed 2006-05-17 12:15:13 -0400
message:
Cleanups
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060517160321-35d3fd51d26eff74
parent: abentley at panoramicfeedback.com-20060517153111-8c951eb1b4d5ae2f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Wed 2006-05-17 12:03:21 -0400
message:
Move tree actions to RevisionInfo
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060517153111-8c951eb1b4d5ae2f
parent: abentley at panoramicfeedback.com-20060517150059-12d51c107d5df87d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Wed 2006-05-17 11:31:11 -0400
message:
Avoid double-reads of each patch
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060517150059-12d51c107d5df87d
parent: abentley at panoramicfeedback.com-20060517145839-bd08975a3a38682d
parent: pqm at pqm.ubuntu.com-20060517085040-ee6e33957c557fba
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Wed 2006-05-17 11:00:59 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060517145839-bd08975a3a38682d
parent: abentley at panoramicfeedback.com-20060517134353-3001a42d3bd9290c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Wed 2006-05-17 10:58:39 -0400
message:
Allow custom base for any revision
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060517134353-3001a42d3bd9290c
parent: abentley at panoramicfeedback.com-20060517133716-1d4d24b17ed9ebf3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Wed 2006-05-17 09:43:53 -0400
message:
Use rightmost parent always
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060517133716-1d4d24b17ed9ebf3
parent: abentley at panoramicfeedback.com-20060516183442-3e3a2b139ad6995e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Wed 2006-05-17 09:37:16 -0400
message:
Always use leftmost base for changesets
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516183442-3e3a2b139ad6995e
parent: abentley at panoramicfeedback.com-20060516182516-5706ab59ccef441d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 14:34:42 -0400
message:
Fix revision-id picking during renames
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516182516-5706ab59ccef441d
parent: abentley at panoramicfeedback.com-20060516180219-3e324f29086cd22c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 14:25:16 -0400
message:
Handle renamed files better
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516180219-3e324f29086cd22c
parent: abentley at panoramicfeedback.com-20060516175005-92e2a2d1e5d35913
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 14:02:19 -0400
message:
Avoid deprecated functionality
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516175005-92e2a2d1e5d35913
parent: abentley at panoramicfeedback.com-20060516174101-f384cbd6299cb652
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 13:50:05 -0400
message:
Handle execute bit on modified files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516174101-f384cbd6299cb652
parent: abentley at panoramicfeedback.com-20060516172219-8bd49093c5bb6897
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 13:41:01 -0400
message:
Stop differentiating whether inventories have revision_ids
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516172219-8bd49093c5bb6897
parent: abentley at panoramicfeedback.com-20060516162208-8b6958a24d087823
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 13:22:19 -0400
message:
Handle new executable files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516162208-8b6958a24d087823
parent: abentley at panoramicfeedback.com-20060516160311-9cbe5813ee8c4d5d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 12:22:08 -0400
message:
Factored out boolean text stuff
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516160311-9cbe5813ee8c4d5d
parent: abentley at panoramicfeedback.com-20060516155842-1d1531747bca570f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 12:03:11 -0400
message:
Lock repository while installing revisions
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516155842-1d1531747bca570f
parent: abentley at panoramicfeedback.com-20060516154041-0a8e56e0359791a2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 11:58:42 -0400
message:
Added install revision progress bar
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516154041-0a8e56e0359791a2
parent: abentley at panoramicfeedback.com-20060516153935-d41041f31ed315e2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 11:40:41 -0400
message:
Don't fail if some data is already installed
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516153935-d41041f31ed315e2
parent: abentley at panoramicfeedback.com-20060516153848-605d93148d90cc1e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 11:39:35 -0400
message:
Downgrade inventory mismatch to warning (source can be inaccurate)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516153848-605d93148d90cc1e
parent: abentley at panoramicfeedback.com-20060516143807-b528a6fe1736e06d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 11:38:48 -0400
message:
Only include revision ids in inventories that originally had them
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516143807-b528a6fe1736e06d
parent: abentley at panoramicfeedback.com-20060516135526-0011b810c586643c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 10:38:07 -0400
message:
Behave properly when there are no properties in a revision
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516135526-0011b810c586643c
parent: abentley at panoramicfeedback.com-20060516134014-f768131ad7cd2a0d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 09:55:26 -0400
message:
Handle empty branches properly
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060516134014-f768131ad7cd2a0d
parent: aaron.bentley at utoronto.ca-20060515223643-f2de2cd4f99c04c3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Tue 2006-05-16 09:40:14 -0400
message:
Fix text parent handling
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060515223643-f2de2cd4f99c04c3
parent: aaron.bentley at utoronto.ca-20060515223553-c53e2e09b4381c4f
parent: pqm at pqm.ubuntu.com-20060512234849-259ff209fff58489
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-15 18:36:43 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060515223553-c53e2e09b4381c4f
parent: aaron.bentley at utoronto.ca-20060515223103-3916135d883522e5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-15 18:35:53 -0400
message:
stop importing gen_changeset
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060515223103-3916135d883522e5
parent: aaron.bentley at utoronto.ca-20060515222703-71f9bc50729665f9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-15 18:31:03 -0400
message:
Removed import of get_intervening revision
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060515222703-71f9bc50729665f9
parent: abentley at panoramicfeedback.com-20060515191526-db2d6f8409aa2f4b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-15 18:27:03 -0400
message:
Factored out write_changeset to select revisions
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060515191526-db2d6f8409aa2f4b
parent: abentley at panoramicfeedback.com-20060515191309-37c054c5a10221a5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Mon 2006-05-15 15:15:26 -0400
message:
Get checkouts in proper order
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060515191309-37c054c5a10221a5
parent: abentley at panoramicfeedback.com-20060515185306-25e0decc79b5cdef
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Mon 2006-05-15 15:13:09 -0400
message:
Fixed base revision picking
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060515185306-25e0decc79b5cdef
parent: abentley at panoramicfeedback.com-20060515173202-f50748568ac149cb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Mon 2006-05-15 14:53:06 -0400
message:
Avoid overwriting action lines
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060515173202-f50748568ac149cb
parent: abentley at panoramicfeedback.com-20060515163842-c011e40c0c3ab226
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Mon 2006-05-15 13:32:02 -0400
message:
SPOT fixes, fix inventory validation
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060515163842-c011e40c0c3ab226
parent: abentley at panoramicfeedback.com-20060515155332-9ed87fb439bb7b86
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Mon 2006-05-15 12:38:42 -0400
message:
Inching closer to supporting multiple revisions per changeset
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060515155332-9ed87fb439bb7b86
parent: abentley at panoramicfeedback.com-20060515144513-fd1b8547fd87f2bd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Mon 2006-05-15 11:53:32 -0400
message:
Ensure all intended rev_ids end up in the revision
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060515144513-fd1b8547fd87f2bd
parent: abentley at panoramicfeedback.com-20060515143111-83739b473fe7bf05
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Mon 2006-05-15 10:45:13 -0400
message:
Include all ancestor revisions in changeset
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060515143111-83739b473fe7bf05
parent: abentley at panoramicfeedback.com-20060515141644-121f7718a83d0049
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Mon 2006-05-15 10:31:11 -0400
message:
Take ChangesetReader as input to merge_changeset
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060515141644-121f7718a83d0049
parent: abentley at panoramicfeedback.com-20060515135200-da7818634120b2ca
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Mon 2006-05-15 10:16:44 -0400
message:
Switch to merge_changeset in test suite
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060515135200-da7818634120b2ca
parent: abentley at panoramicfeedback.com-20060515125932-b6d04bcad5dd8522
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Mon 2006-05-15 09:52:00 -0400
message:
Get single-revision case working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060515125932-b6d04bcad5dd8522
parent: aaron.bentley at utoronto.ca-20060515121529-df5b41bb84a6e1a1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Mon 2006-05-15 08:59:32 -0400
message:
Handle new directories properly
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060515121529-df5b41bb84a6e1a1
parent: aaron.bentley at utoronto.ca-20060515115102-1f88e5f55acddde8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-15 08:15:29 -0400
message:
More work on installing changesets
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060515115102-1f88e5f55acddde8
parent: aaron.bentley at utoronto.ca-20060514171854-75c011da5cf965a7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Mon 2006-05-15 07:51:02 -0400
message:
Started work on testing install_revisions/handling empty changesets
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514171854-75c011da5cf965a7
parent: aaron.bentley at utoronto.ca-20060514171345-7231837563510aff
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sun 2006-05-14 13:18:54 -0400
message:
Use cset_info.target as target revision
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514171345-7231837563510aff
parent: aaron.bentley at utoronto.ca-20060514170742-2db04a270a479ce3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sun 2006-05-14 13:13:45 -0400
message:
Changed changeset version number to 0.7
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514170742-2db04a270a479ce3
parent: aaron.bentley at utoronto.ca-20060514170516-db6f48ab2e5f77ac
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sun 2006-05-14 13:07:42 -0400
message:
Moved gen_changeset back to old
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514170516-db6f48ab2e5f77ac
parent: aaron.bentley at utoronto.ca-20060514162231-4e64b494206f3004
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sun 2006-05-14 13:05:16 -0400
message:
Moved changeset/old_tests.py to test_changeset.py
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514162231-4e64b494206f3004
parent: aaron.bentley at utoronto.ca-20060514162112-eaf7615586e8acf0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sun 2006-05-14 12:22:31 -0400
message:
Read revision properties
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514162112-eaf7615586e8acf0
parent: aaron.bentley at utoronto.ca-20060514153625-4e97c9f7bff001c9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sun 2006-05-14 12:21:12 -0400
message:
Reactivated revision sha1 check
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514153625-4e97c9f7bff001c9
parent: aaron.bentley at utoronto.ca-20060514144825-035a10fc102dcfd2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sun 2006-05-14 11:36:25 -0400
message:
Strengthen tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514144825-035a10fc102dcfd2
parent: aaron.bentley at utoronto.ca-20060514135815-d590f78ad9bbcdea
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sun 2006-05-14 10:48:25 -0400
message:
Got all tests passing using serializer
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514135815-d590f78ad9bbcdea
parent: aaron.bentley at utoronto.ca-20060514135749-1569e556e5990ac8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sun 2006-05-14 09:58:15 -0400
message:
Avoided None/NULL_REVISION ambiguity
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514135749-1569e556e5990ac8
parent: aaron.bentley at utoronto.ca-20060514014241-bbfa844d9fd6d32b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sun 2006-05-14 09:57:49 -0400
message:
Switched tests to use serializer
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514014241-bbfa844d9fd6d32b
parent: aaron.bentley at utoronto.ca-20060514011027-3ef7f7db03e56c41
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-13 21:42:41 -0400
message:
Got merge test working
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514011027-3ef7f7db03e56c41
parent: aaron.bentley at utoronto.ca-20060514003858-0698218f821eaa02
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-13 21:10:27 -0400
message:
Got parent_id handling working
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060514003858-0698218f821eaa02
parent: aaron.bentley at utoronto.ca-20060513075834-9073c2493d16ab99
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-13 20:38:58 -0400
message:
Fixed most revision attribute handling
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060513075834-9073c2493d16ab99
parent: aaron.bentley at utoronto.ca-20060513075754-b4a022a8677e2dc4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-13 03:58:34 -0400
message:
Get changeset merges closer to working
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060513075754-b4a022a8677e2dc4
parent: aaron.bentley at utoronto.ca-20060512225721-542de5376bb925ac
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Sat 2006-05-13 03:57:54 -0400
message:
Added changeset-merging functionality
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060512225721-542de5376bb925ac
parent: abentley at panoramicfeedback.com-20060512210340-233f3e6769b9ffed
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Fri 2006-05-12 18:57:21 -0400
message:
Use common ancestor as a changeset base when unspecified
Diffs from the common ancestor best show the changes unique to the source
branch, without showing changes applied to the target branch.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060512210340-233f3e6769b9ffed
parent: abentley at panoramicfeedback.com-20060512205225-82ea9c76d3d6b135
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-12 17:03:40 -0400
message:
Switch the fetcher
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060512205225-82ea9c76d3d6b135
parent: abentley at panoramicfeedback.com-20060512193654-ea40b4607a33df0b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-12 16:52:25 -0400
message:
Start getting changeset merging under test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060512193654-ea40b4607a33df0b
parent: abentley at panoramicfeedback.com-20060512191732-5c75f561c43ab92e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-12 15:36:54 -0400
message:
Stop using deprecated function
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060512191732-5c75f561c43ab92e
parent: abentley at panoramicfeedback.com-20060512190220-5dd27c966f881f34
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-12 15:17:32 -0400
message:
Fixed encoding bug. All tests pass
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060512190220-5dd27c966f881f34
parent: abentley at panoramicfeedback.com-20060512184452-d6749ce6f90eb033
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-12 15:02:20 -0400
message:
More API updates
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060512184452-d6749ce6f90eb033
parent: aaron.bentley at utoronto.ca-20060512050627-577a244f0cf0fb4d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: w-changeset
timestamp: Fri 2006-05-12 14:44:52 -0400
message:
Fixed string-instead of revision bug
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060512050627-577a244f0cf0fb4d
parent: aaron.bentley at utoronto.ca-20060512042159-197e08f096ca0bce
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Fri 2006-05-12 01:06:27 -0400
message:
More API updates
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060512042159-197e08f096ca0bce
parent: aaron.bentley at utoronto.ca-20060512033324-5947a3f509a1cb9d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Fri 2006-05-12 00:21:59 -0400
message:
Ensured revision ID is stored in ChangesetTree inventories
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060512033324-5947a3f509a1cb9d
parent: aaron.bentley at utoronto.ca-20060512024337-857e6e9c118e6c16
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Thu 2006-05-11 23:33:24 -0400
message:
Disabled validate_revisions (needs info it doesn't have), updated API to repos
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060512024337-857e6e9c118e6c16
parent: aaron.bentley at utoronto.ca-20060512020817-00306d9abd28d780
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Thu 2006-05-11 22:43:37 -0400
message:
API updates
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060512020817-00306d9abd28d780
parent: aaron.bentley at utoronto.ca-20060512012603-623d430236674292
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Thu 2006-05-11 22:08:17 -0400
message:
Got old changeset tests running
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060512012603-623d430236674292
parent: aaron.bentley at utoronto.ca-20060512005530-231e9551d983a39a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Thu 2006-05-11 21:26:03 -0400
message:
Removed test_parent
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060512005530-231e9551d983a39a
parent: john at arbash-meinel.com-20060101005337-54e006f2115719a5
parent: pqm at pqm.ubuntu.com-20060508035625-57977d108d877af8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: w-changeset
timestamp: Thu 2006-05-11 20:55:30 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20060101005337-54e006f2115719a5
parent: john at arbash-meinel.com-20051231235408-e8aa74b9939bb80e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-w-changeset
timestamp: Sat 2005-12-31 18:53:37 -0600
message:
Worked out the changeset command.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231235408-e8aa74b9939bb80e
parent: john at arbash-meinel.com-20051231210032-5a5decddb3cf8973
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-w-changeset
timestamp: Sat 2005-12-31 17:54:08 -0600
message:
Moving patches testing into main test suite.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231210032-5a5decddb3cf8973
parent: john at arbash-meinel.com-20051231205542-af053340b79f72a5
parent: john at arbash-meinel.com-20051222233243-1ff7ae626c03d3d3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-w-changeset
timestamp: Sat 2005-12-31 15:00:32 -0600
message:
[merge] jam-integration 1490
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231205542-af053340b79f72a5
parent: john at arbash-meinel.com-20051231185924-75229567071587b9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-w-changeset
timestamp: Sat 2005-12-31 14:55:42 -0600
message:
Adding patches.py into bzrlib, including the tests into the test suite.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231185924-75229567071587b9
parent: john at arbash-meinel.com-20051205122737-12540e6ec3470d97
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-w-changeset
timestamp: Sat 2005-12-31 12:59:24 -0600
message:
[merge] bzr.dev 1491
------------------------------------------------------------
merged: john at arbash-meinel.com-20051205122737-12540e6ec3470d97
parent: john at arbash-meinel.com-20051120013741-5de2ea06b61bb803
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-w-changeset
timestamp: Mon 2005-12-05 06:27:37 -0600
message:
Trying to update the tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120013741-5de2ea06b61bb803
parent: john at arbash-meinel.com-20051119042251-aaa8514b7d68c29f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-w-changeset
timestamp: Sat 2005-11-19 19:37:41 -0600
message:
Created output format, slightly simplified code
------------------------------------------------------------
merged: john at arbash-meinel.com-20051119042251-aaa8514b7d68c29f
parent: john at arbash-meinel.com-20051118165056-97f164d958a1886b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-w-changeset
timestamp: Fri 2005-11-18 22:22:51 -0600
message:
Working on creating a factor for serializing changesets.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118165056-97f164d958a1886b
parent: john at arbash-meinel.com-20051118044352-e71e51fcb843025b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-w-changeset
timestamp: Fri 2005-11-18 10:50:56 -0600
message:
Moved testdata code to subdirectory
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118044352-e71e51fcb843025b
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
parent: john at arbash-meinel.com-20051117204806-013b3027c63d642b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-w-changeset
timestamp: Thu 2005-11-17 22:43:52 -0600
message:
merging in the changeset code
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117204806-013b3027c63d642b
parent: aaron.bentley at utoronto.ca-20051021025723-644c477c0cdf847d
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-11-17 14:48:06 -0600
message:
Fixing options to apply-changeset
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051021025723-644c477c0cdf847d
parent: john at arbash-meinel.com-20051020175200-18dc8c57aedfaa5e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-20 22:57:23 -0400
message:
Fixed test case by adding last_changed
------------------------------------------------------------
merged: john at arbash-meinel.com-20051020175200-18dc8c57aedfaa5e
parent: john at arbash-meinel.com-20051020174506-c8ff5cddb6f69c7c
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-20 12:52:00 -0500
message:
Recreated the factory. We really need InventoryEntry.create()
------------------------------------------------------------
merged: john at arbash-meinel.com-20051020174506-c8ff5cddb6f69c7c
parent: john at arbash-meinel.com-20051020083043-28e90f50ca1d1cda
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-20 12:45:06 -0500
message:
Got most of test_changeset to work. Still needs work for Aaron's test code.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051020083043-28e90f50ca1d1cda
parent: john at arbash-meinel.com-20051020064311-b7c3c4cebe4bb0cb
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-20 03:30:43 -0500
message:
Almost there. Just need to track down a few remaining bugs.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051020064311-b7c3c4cebe4bb0cb
parent: john at arbash-meinel.com-20051020063517-8f16714fc96d0d4b
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-20 01:43:11 -0500
message:
Fixed a bug based on the new InventoryEntry separation.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051020063517-8f16714fc96d0d4b
parent: john at arbash-meinel.com-20051020025309-4634e1c343914a89
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-20 01:35:17 -0500
message:
Getting closer to being able to read back the changesets, still broken, though.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051020025309-4634e1c343914a89
parent: john at arbash-meinel.com-20051015071656-1dac364f5f573249
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-10-19 21:53:09 -0500
message:
Hiding OPTIONS since it has been removed. Updating for the new Branch.open_containing()
------------------------------------------------------------
merged: john at arbash-meinel.com-20051015071656-1dac364f5f573249
parent: john at arbash-meinel.com-20051015062652-b589f7c727a7173e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-10-15 02:16:56 -0500
message:
Small performance enhancement.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051015062652-b589f7c727a7173e
parent: john at arbash-meinel.com-20051015045927-fe7f6aff8a1b679c
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-10-15 01:26:52 -0500
message:
Upgrading to v5 (ignoring compatibility)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051015045927-fe7f6aff8a1b679c
parent: abentley at panoramicfeedback.com-20050927220115-c655b54de372b0aa
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-10-14 23:59:27 -0500
message:
Working on v4,v5 compatibility
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20050927220115-c655b54de372b0aa
parent: john at arbash-meinel.com-20050923235512-59dd447b5a1f23ee
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-09-27 18:01:16 -0400
message:
Switched to using the common ancestor for changeset merge base
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923235512-59dd447b5a1f23ee
parent: aaron.bentley at utoronto.ca-20050923232146-95b633385df6b6e5
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 18:55:12 -0500
message:
With the IterableFile fix, now we can remove the workaround.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050923232146-95b633385df6b6e5
parent: john at arbash-meinel.com-20050923212850-426a0a9c1a2ab44f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Fri 2005-09-23 19:21:46 -0400
message:
Fixed iterator behaviour of IterableFile (the irony!)
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923212850-426a0a9c1a2ab44f
parent: john at arbash-meinel.com-20050923212216-60d6eb8f87aa9bf4
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 16:28:50 -0500
message:
Added a few more test patches.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923212216-60d6eb8f87aa9bf4
parent: john at arbash-meinel.com-20050923212134-ce28476dfbaeb05f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 16:22:16 -0500
message:
Allowing *** to be a patch header.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923212134-ce28476dfbaeb05f
parent: john at arbash-meinel.com-20050923202825-451c235b06c1693f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 16:21:35 -0500
message:
Adding more test patches to the test suite.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923202825-451c235b06c1693f
parent: john at arbash-meinel.com-20050923191145-ff9e5a82217e97a7
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 15:28:25 -0500
message:
Fixed patches to return the lines after the last hunk.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923191145-ff9e5a82217e97a7
parent: john at arbash-meinel.com-20050923044238-e8d914a734aa1174
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 14:11:45 -0500
message:
Updated to having a changeset specific message.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923044238-e8d914a734aa1174
parent: john at arbash-meinel.com-20050923034557-fcaa667012c73e83
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-09-22 23:42:38 -0500
message:
Updated to latest bzr.dev changes (serialization, test cases, etc)
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923034557-fcaa667012c73e83
parent: john at arbash-meinel.com-20050923034521-e9097d28ac117751
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-09-22 22:45:57 -0500
message:
Missed one
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923034521-e9097d28ac117751
parent: john at arbash-meinel.com-20050917165746-31ec93f725db4a85
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-09-22 22:45:22 -0500
message:
Switching from *** to ===
------------------------------------------------------------
merged: john at arbash-meinel.com-20050917165746-31ec93f725db4a85
parent: aaron.bentley at utoronto.ca-20050910214922-36c6341e698259df
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-09-17 12:57:46 -0400
message:
Updating to current Branch.open() and RevisionSpec changes.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050910214922-36c6341e698259df
parent: aaron.bentley at utoronto.ca-20050910214733-95bf30c61ad33f29
parent: john at arbash-meinel.com-20050801020305-ab420d2764ed6fa8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-09-10 17:49:22 -0400
message:
merged John's latest stuff
------------------------------------------------------------
merged: john at arbash-meinel.com-20050801020305-ab420d2764ed6fa8
parent: john at arbash-meinel.com-20050726150912-9d6366fa2dbb2a14
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-07-31 21:03:05 -0500
message:
Re-adding the --revision flag to make inspecting changes easier.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050726150912-9d6366fa2dbb2a14
parent: john at arbash-meinel.com-20050721221555-79cc2967864cd571
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-07-26 10:09:12 -0500
message:
Applied Aaron's 1-line patch.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050910214733-95bf30c61ad33f29
parent: abentley at panoramicfeedback.com-20050817181957-e9154118765b08d4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-09-10 17:47:33 -0400
message:
Updated tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20050817181957-e9154118765b08d4
parent: abentley at panoramicfeedback.com-20050817173849-67187f850a36d634
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-08-17 14:19:57 -0400
message:
Cleaned up handling of files with no terminating \n
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20050817173849-67187f850a36d634
parent: abentley at panoramicfeedback.com-20050727184633-8b8601908bcdb90a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-08-17 13:38:49 -0400
message:
Updated patch to match bzrtools
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20050727184633-8b8601908bcdb90a
parent: abentley at panoramicfeedback.com-20050727184104-79f8d0d70cb26cfc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-07-27 14:46:33 -0400
message:
Switched to native patch application, added tests for terminating newlines
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20050727184104-79f8d0d70cb26cfc
parent: abentley at panoramicfeedback.com-20050727183754-29565e2707b63359
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-07-27 14:41:04 -0400
message:
Added patches.py
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20050727183754-29565e2707b63359
parent: abentley at panoramicfeedback.com-20050726142519-9bbc4f57e193ee49
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-07-27 14:37:54 -0400
message:
added IterableFile class
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20050726142519-9bbc4f57e193ee49
parent: john at arbash-meinel.com-20050721221555-79cc2967864cd571
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-07-26 10:25:19 -0400
message:
Updated to match API change
------------------------------------------------------------
merged: john at arbash-meinel.com-20050721221555-79cc2967864cd571
parent: john at arbash-meinel.com-20050718050545-fc6da89b53d5511d
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-07-21 16:15:55 -0600
message:
Switching from random walk, to random progression
------------------------------------------------------------
merged: john at arbash-meinel.com-20050718050545-fc6da89b53d5511d
parent: john at arbash-meinel.com-20050716173855-a38d2990b32a4649
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-07-18 00:05:45 -0500
message:
Updating for explicitly defined directories.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050716173855-a38d2990b32a4649
parent: john at arbash-meinel.com-20050716162204-ca86975b99b2742e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-16 12:38:55 -0500
message:
Fixed a bug in the rename code, added more tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050716162204-ca86975b99b2742e
parent: john at arbash-meinel.com-20050716041144-0a3a89f5afc34a59
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-16 11:22:04 -0500
message:
Handling international characters, added more test cases.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050716041144-0a3a89f5afc34a59
parent: john at arbash-meinel.com-20050715232601-1a81b32a14d9647b
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-07-15 23:11:44 -0500
message:
Updated the auto-commit functionality, and adding to pending-merges, more testing.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050715232601-1a81b32a14d9647b
parent: john at arbash-meinel.com-20050714012834-29c6539e56191f42
parent: abentley at panoramicfeedback.com-20050715190027-60b72a90490baa4c
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-07-15 18:26:01 -0500
message:
Merging Aaron Bentley's fixes to the changeset logic.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20050715190027-60b72a90490baa4c
parent: john at arbash-meinel.com-20050714012834-29c6539e56191f42
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-07-15 15:00:27 -0400
message:
Fleshed out MockTree, fixed all test failures
------------------------------------------------------------
merged: john at arbash-meinel.com-20050714012834-29c6539e56191f42
parent: john at arbash-meinel.com-20050714005222-36fd6b3ce894d7de
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-07-13 19:28:34 -0600
message:
(broken) problem with removes.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050714005222-36fd6b3ce894d7de
parent: john at arbash-meinel.com-20050714002705-c6fae822e6d8f876
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-07-13 18:52:22 -0600
message:
Tests pass. Now ChangesetTree has it's own inventory.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050714002705-c6fae822e6d8f876
parent: john at arbash-meinel.com-20050713222435-e4106b9c07341fb2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-07-13 18:27:05 -0600
message:
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids
------------------------------------------------------------
merged: john at arbash-meinel.com-20050713222435-e4106b9c07341fb2
parent: john at arbash-meinel.com-20050713214657-94311fce504f59c1
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-07-13 16:24:36 -0600
message:
Cleaning up from pychecker.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050713214657-94311fce504f59c1
parent: john at arbash-meinel.com-20050713200802-b90130548125dfdc
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-07-13 15:46:57 -0600
message:
Starting to write tests for changeset, discovering some errors as I go.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050713200802-b90130548125dfdc
parent: john at arbash-meinel.com-20050711065750-6da62e4042bd87e6
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-07-13 14:08:02 -0600
message:
Added common to the set of tests, fixed a problem with time conversions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050711065750-6da62e4042bd87e6
parent: john at arbash-meinel.com-20050711063431-bbfe16c39fa98256
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-07-11 01:57:50 -0500
message:
Working on test cases, starting with the empty project issues.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050711063431-bbfe16c39fa98256
parent: john at arbash-meinel.com-20050711044610-3ca0327c6a222f67
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-07-11 01:34:31 -0500
message:
gen_changeset.py shouldn't really use a label.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050711044610-3ca0327c6a222f67
parent: john at arbash-meinel.com-20050710163624-ea630748160dc9f7
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-07-10 23:46:11 -0500
message:
Handle the case where an ancestor doesn't exist in the revision store.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050710163624-ea630748160dc9f7
parent: john at arbash-meinel.com-20050710163140-f938871b1e269e98
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-07-10 11:36:24 -0500
message:
Removing an unused function.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050710163140-f938871b1e269e98
parent: john at arbash-meinel.com-20050710162025-010e82b26b3f6f84
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-07-10 11:31:40 -0500
message:
Fixed handling when base does not exist in local tree, and workaround for older revisions without precursor sha hashes.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050710162025-010e82b26b3f6f84
parent: john at arbash-meinel.com-20050710155426-fb2d18d7795114de
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-07-10 11:20:25 -0500
message:
Some fixups for gen_changeset.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050710155426-fb2d18d7795114de
parent: john at arbash-meinel.com-20050710155112-ba043ee80b7a2a1d
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-07-10 10:54:26 -0500
message:
Switching away from universal newlines,
hopefully we can find a way to prevent mailers from destroying
changesets.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050710155112-ba043ee80b7a2a1d
parent: john at arbash-meinel.com-20050710152309-910378616528a24f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-07-10 10:51:12 -0500
message:
Cleaning up code for latest bzr.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050710152309-910378616528a24f
parent: john at arbash-meinel.com-20050710151415-e1eb3a535097e4bc
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-07-10 10:23:09 -0500
message:
Making BASE optional, defaulting to TARGET.parents[0]
------------------------------------------------------------
merged: john at arbash-meinel.com-20050710151415-e1eb3a535097e4bc
parent: john at arbash-meinel.com-20050710064038-d59be0a0a1f2d5f4
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-07-10 10:14:15 -0500
message:
Applying patch from Robey Pointer to clean up apply_changeset.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050710064038-d59be0a0a1f2d5f4
parent: john at arbash-meinel.com-20050704065152-26d062ad7befd806
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-07-10 01:40:38 -0500
message:
(broken), starting to change the syntax of the command to allow cset to take a base and a target.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050704065152-26d062ad7befd806
parent: john at arbash-meinel.com-20050704054440-ed584dd40745fdde
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-07-04 01:51:52 -0500
message:
Working on apply_changeset
------------------------------------------------------------
merged: john at arbash-meinel.com-20050704054440-ed584dd40745fdde
parent: john at arbash-meinel.com-20050702195457-e006ae24d572a3e8
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-07-04 00:44:40 -0500
message:
Refactoring, moving test code into test (switching back to assert is None)
------------------------------------------------------------
merged: john at arbash-meinel.com-20050702195457-e006ae24d572a3e8
parent: john at arbash-meinel.com-20050702195442-f94d66c7fd15cc39
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-02 14:54:58 -0500
message:
SUCCESS, we now are able to validate the inventory XML.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050702195442-f94d66c7fd15cc39
parent: john at arbash-meinel.com-20050702190534-5d151ec01dbcfbc0
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-02 14:54:42 -0500
message:
SUCCESS, we now are able to validate the inventory XML.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050702190534-5d151ec01dbcfbc0
parent: john at arbash-meinel.com-20050702184320-06828a2c573b0d98
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-02 14:05:34 -0500
message:
Moving the validation into part of the reading.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050702184320-06828a2c573b0d98
parent: john at arbash-meinel.com-20050702074639-243ec492050184f3
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-02 13:43:20 -0500
message:
Doing some internal validation before allowing processing to continue, additional checks at the command level.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050702074639-243ec492050184f3
parent: john at arbash-meinel.com-20050702074618-64b83cba7a1829b9
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-02 02:46:39 -0500
message:
verify-changeset now validates that revision hashes match the expected value.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050702074618-64b83cba7a1829b9
parent: john at arbash-meinel.com-20050702072008-26d6e862eff44079
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-02 02:46:18 -0500
message:
read_changeset now parses the date: subheader of revisions correctly.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050702072008-26d6e862eff44079
parent: john at arbash-meinel.com-20050702071014-ca51f813dd55a7b5
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-02 02:20:08 -0500
message:
Several fixes for handling the case where you are doing a changeset against revno=0 (Null base)
------------------------------------------------------------
merged: john at arbash-meinel.com-20050702071014-ca51f813dd55a7b5
parent: john at arbash-meinel.com-20050702070705-71d894e83e7ba22a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-02 02:10:14 -0500
message:
Fixed a bug in the case that there are no revision committed yet.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050702070705-71d894e83e7ba22a
parent: john at arbash-meinel.com-20050702063459-031705c159631d21
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-02 02:07:05 -0500
message:
Simplified the header, only output base if it is not the expected one.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050702063459-031705c159631d21
parent: john at arbash-meinel.com-20050702060300-e36fa2c400796477
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-02 01:35:00 -0500
message:
A couple more fixups, it seems actually capable now of writing out a changeset, and reading it back.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050702060300-e36fa2c400796477
parent: john at arbash-meinel.com-20050701234442-2ab001bbf6460e4e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-07-02 01:03:00 -0500
message:
Lots of updates. Using a minimized annotations for changesets.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050701234442-2ab001bbf6460e4e
parent: john at arbash-meinel.com-20050701234427-e8f289fc25319159
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-07-01 18:44:42 -0500
message:
Changed all test code into using self.assertEquals instead of assert
------------------------------------------------------------
merged: john at arbash-meinel.com-20050701234427-e8f289fc25319159
parent: aaron.bentley at utoronto.ca-20050701183923-a62103dc665202a8
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-07-01 18:44:27 -0500
message:
Made test_plugins load read_changset lazy, rather than plugin load.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050701183923-a62103dc665202a8
parent: aaron.bentley at utoronto.ca-20050701175954-bcb1dd3718fcb6b6
committer: aaron.bentley at utoronto.ca
timestamp: Fri 2005-07-01 14:39:23 -0400
message:
Make contents-addressing configurable
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050701175954-bcb1dd3718fcb6b6
parent: aaron.bentley at utoronto.ca-20050701030239-fd5434ca1e0fc36d
committer: aaron.bentley at utoronto.ca
timestamp: Fri 2005-07-01 13:59:54 -0400
message:
Disabled test code
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050701030239-fd5434ca1e0fc36d
parent: aaron.bentley at utoronto.ca-20050701021245-8826b91295a3e5f8
committer: aaron.bentley at utoronto.ca
timestamp: Thu 2005-06-30 23:02:39 -0400
message:
Evaluate patches against file paths, not file ids
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050701021245-8826b91295a3e5f8
parent: aaron.bentley at utoronto.ca-20050701014706-98dcd4dd5cb02eff
committer: aaron.bentley at utoronto.ca
timestamp: Thu 2005-06-30 22:12:45 -0400
message:
Implemented iteration over ids
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050701014706-98dcd4dd5cb02eff
parent: aaron.bentley at utoronto.ca-20050701012609-9ed99945ec1ec3da
committer: aaron.bentley at utoronto.ca
timestamp: Thu 2005-06-30 21:47:06 -0400
message:
Implemented deletion for ChangesetTrees
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050701012609-9ed99945ec1ec3da
parent: aaron.bentley at utoronto.ca-20050701011712-6d8deb8be1108bdf
committer: aaron.bentley at utoronto.ca
timestamp: Thu 2005-06-30 21:26:09 -0400
message:
Added safety check to patch call
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050701011712-6d8deb8be1108bdf
parent: aaron.bentley at utoronto.ca-20050701005012-0cfc9091e48d6faa
committer: aaron.bentley at utoronto.ca
timestamp: Thu 2005-06-30 21:17:12 -0400
message:
Got file gets working
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050701005012-0cfc9091e48d6faa
parent: aaron.bentley at utoronto.ca-20050701004812-449cf077546a6637
committer: aaron.bentley at utoronto.ca
timestamp: Thu 2005-06-30 20:50:12 -0400
message:
fixed method names
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050701004812-449cf077546a6637
parent: aaron.bentley at utoronto.ca-20050701000153-e38cba51ca3f8a0a
committer: aaron.bentley at utoronto.ca
timestamp: Thu 2005-06-30 20:48:12 -0400
message:
Got get_file working for new files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050701000153-e38cba51ca3f8a0a
parent: aaron.bentley at utoronto.ca-20050630233707-4b0c521ca62f0848
committer: aaron.bentley at utoronto.ca
timestamp: Thu 2005-06-30 20:01:53 -0400
message:
Handled moves and adds properly
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050630233707-4b0c521ca62f0848
parent: aaron.bentley at utoronto.ca-20050630225421-a6a4f5ae500dcddf
committer: aaron.bentley at utoronto.ca
timestamp: Thu 2005-06-30 19:37:07 -0400
message:
Improved rename handling
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20050630225421-a6a4f5ae500dcddf
parent: john at arbash-meinel.com-20050630194451-8ecb7d6d880d7b42
committer: aaron.bentley at utoronto.ca
timestamp: Thu 2005-06-30 18:54:21 -0400
message:
Added non-working ChangesetTree
------------------------------------------------------------
merged: john at arbash-meinel.com-20050630194451-8ecb7d6d880d7b42
parent: john at arbash-meinel.com-20050630180642-119a64e639d9f7ac
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-06-30 14:44:51 -0500
message:
Added some highres formatting of datestamps.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050630180642-119a64e639d9f7ac
parent: john at arbash-meinel.com-20050630163953-9278dc22a5d64fcb
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-06-30 13:06:42 -0500
message:
(broken) Working on changing the processing to use a ChangesetTree.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050630163953-9278dc22a5d64fcb
parent: john at arbash-meinel.com-20050629155452-18f02584db656533
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-06-30 11:39:53 -0500
message:
Working on updating the information to be minimalistic
------------------------------------------------------------
merged: john at arbash-meinel.com-20050629155452-18f02584db656533
parent: john at arbash-meinel.com-20050629065945-14a14a6514d5fa46
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-06-29 10:54:52 -0500
message:
Made read_changeset able to spit out 'Revision' entities.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050629065945-14a14a6514d5fa46
parent: john at arbash-meinel.com-20050629011806-7fa2f7368e0dfc1b
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-06-29 01:59:45 -0500
message:
Updated so that read_changeset is able to parse the output
------------------------------------------------------------
merged: john at arbash-meinel.com-20050629011806-7fa2f7368e0dfc1b
parent: john at arbash-meinel.com-20050628223225-e0e363cc391ab69e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-28 20:18:07 -0500
message:
Timezone doesn't need 9 digits of precision.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050628223225-e0e363cc391ab69e
parent: john at arbash-meinel.com-20050628222835-c72482b8505513a0
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-28 17:32:25 -0500
message:
Fixed a bogus offset issue with revision numbers.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050628222835-c72482b8505513a0
parent: john at arbash-meinel.com-20050628222332-1a7c71f9d8f889f3
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-28 17:28:35 -0500
message:
Use universal newlines wherever appropriate.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050628222332-1a7c71f9d8f889f3
parent: john at arbash-meinel.com-20050628221900-2ecec40914076c21
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-28 17:23:32 -0500
message:
Fixed location of bzrlib.osutils
------------------------------------------------------------
merged: john at arbash-meinel.com-20050628221900-2ecec40914076c21
parent: john at arbash-meinel.com-20050628220830-aad25e5b75a60615
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-28 17:19:00 -0500
message:
Some cleanup to the send_changeset work.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050628220830-aad25e5b75a60615
parent: john at arbash-meinel.com-20050628215706-382b5a30719c6ccf
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-28 17:08:30 -0500
message:
Merging send-changeset updates from jrydberg
------------------------------------------------------------
merged: john at arbash-meinel.com-20050628215706-382b5a30719c6ccf
parent: john at arbash-meinel.com-20050628214536-b4e19f1023cbcad1
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-28 16:57:06 -0500
message:
Added a file to put the changeset into.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050628214536-b4e19f1023cbcad1
parent: john at arbash-meinel.com-20050628213930-d984879c2b152bc1
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-28 16:45:36 -0500
message:
Fixed up the argument handling so it handles null portions of the range correctly.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050628213930-d984879c2b152bc1
parent: john at arbash-meinel.com-20050628212829-04a9bc8880a484f1
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-28 16:39:30 -0500
message:
Now capable of generating rollup changesets.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050628212829-04a9bc8880a484f1
parent: john at arbash-meinel.com-20050628212632-25f22febe9976e13
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-28 16:28:29 -0500
message:
Adding the commit message for each revision.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050628212632-25f22febe9976e13
parent: john at arbash-meinel.com-20050628200252-eac0d9db2e52cb16
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-28 16:26:32 -0500
message:
Added some work to allow rollup revisions, and handling multiple parents.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050628200252-eac0d9db2e52cb16
parent: john at arbash-meinel.com-20050623141112-3c1ce011e1ca8d6d
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-28 15:02:52 -0500
message:
Adding send-changeset from Johan Rydberg
------------------------------------------------------------
merged: john at arbash-meinel.com-20050623141112-3c1ce011e1ca8d6d
parent: john at arbash-meinel.com-20050622170912-812059271adc7ea0
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-06-23 09:11:12 -0500
message:
Adding register_command
------------------------------------------------------------
merged: john at arbash-meinel.com-20050622170912-812059271adc7ea0
parent: john at arbash-meinel.com-20050621214644-07db59734ece1011
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Wed 2005-06-22 12:09:12 -0500
message:
Properly registering the plugin.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050621214644-07db59734ece1011
parent: john at arbash-meinel.com-20050621185439-8a1626ad05b52b9a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-21 16:46:45 -0500
message:
Removing download/upload scripts, using rsync-pull/push instead
------------------------------------------------------------
merged: john at arbash-meinel.com-20050621185439-8a1626ad05b52b9a
parent: john at arbash-meinel.com-20050621185237-1ea0dfbf3f4f8448
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-21 13:54:39 -0500
message:
Adding a download function.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050621185237-1ea0dfbf3f4f8448
parent: john at arbash-meinel.com-20050621185221-20b3d63150e59436
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-21 13:52:38 -0500
message:
Adding an upload script, taken from the bzr mainline source.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050621185221-20b3d63150e59436
parent: john at arbash-meinel.com-20050620050606-75e09678cc5ea0aa
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-06-21 13:52:21 -0500
message:
Some minor fixups
------------------------------------------------------------
merged: john at arbash-meinel.com-20050620050606-75e09678cc5ea0aa
parent: john at arbash-meinel.com-20050620041931-05cd49a5f79ad8a9
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-06-20 00:06:06 -0500
message:
adding apply-changset, plus more meta information.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050620041931-05cd49a5f79ad8a9
parent: john at arbash-meinel.com-20050620041844-2e4d9153b4ffacf2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-19 23:19:31 -0500
message:
Removing test directories.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050620041844-2e4d9153b4ffacf2
parent: john at arbash-meinel.com-20050620004707-323c80828a5c04ae
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-19 23:18:44 -0500
message:
Created an apply-changeset function, and modified output for better parsing.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050620004707-323c80828a5c04ae
parent: john at arbash-meinel.com-20050620004357-97aaba2d17636553
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-19 19:47:07 -0500
message:
Crazy changes, moving file out of directory, and moving that directory.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050620004357-97aaba2d17636553
parent: john at arbash-meinel.com-20050620004236-dafc24d5c328530a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-19 19:43:57 -0500
message:
Adding a test directory
------------------------------------------------------------
merged: john at arbash-meinel.com-20050620004236-dafc24d5c328530a
parent: john at arbash-meinel.com-20050620004104-0a462fa1d203c741
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-19 19:42:36 -0500
message:
Renamed directory
------------------------------------------------------------
merged: john at arbash-meinel.com-20050620004104-0a462fa1d203c741
parent: john at arbash-meinel.com-20050619235124-3166a5bb7263f5b7
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-19 19:41:04 -0500
message:
Working on properly representing renames.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050619235124-3166a5bb7263f5b7
parent: john at arbash-meinel.com-20050619234957-4e9542e7d2f3d832
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-19 18:51:24 -0500
message:
Fixed a typo. Looking in the wrong inventory.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050619234957-4e9542e7d2f3d832
parent: john at arbash-meinel.com-20050619225045-c01df86b335d67d1
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-19 18:49:57 -0500
message:
Now adding the patch information to the ChangesetInfo
------------------------------------------------------------
merged: john at arbash-meinel.com-20050619225045-c01df86b335d67d1
parent: john at arbash-meinel.com-20050619223903-b85a522a84697931
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-19 17:50:45 -0500
message:
Added some extra work into changeset, created some dummy files for testing.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050619223903-b85a522a84697931
parent: john at arbash-meinel.com-20050618050713-fc672dd63d89571c
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-19 17:39:03 -0500
message:
Added a bunch more information about changesets. Can now read back in all of the meta information.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050618050713-fc672dd63d89571c
parent: john at arbash-meinel.com-20050617214231-8480f48dcbbb94d3
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-06-18 00:07:13 -0500
message:
Moving id info to end.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050617214231-8480f48dcbbb94d3
parent: john at arbash-meinel.com-20050617194352-628dbc604824de10
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-06-17 16:42:31 -0500
message:
Updated to now include the diffs
------------------------------------------------------------
merged: john at arbash-meinel.com-20050617194352-628dbc604824de10
parent: john at arbash-meinel.com-20050617165307-6536b99344ed3167
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-06-17 14:43:52 -0500
message:
Added printout of file ids, need directory ids
------------------------------------------------------------
merged: john at arbash-meinel.com-20050617165307-6536b99344ed3167
parent: john at arbash-meinel.com-20050617163826-946bf076099df59f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-06-17 11:53:08 -0500
message:
Added a couple more bits
------------------------------------------------------------
merged: john at arbash-meinel.com-20050617163826-946bf076099df59f
parent: jameinel at Jigglypuff.local-20050617163615-7797b80441754f0e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-06-17 11:38:26 -0500
message:
Fixed some typos.
------------------------------------------------------------
merged: jameinel at Jigglypuff.local-20050617163615-7797b80441754f0e
committer: John Arbash Meinel <jameinel at Jigglypuff.local>
timestamp: Fri 2005-06-17 11:36:15 -0500
message:
Just an initial working step.
More information about the bazaar-commits
mailing list