Rev 2248: Update from HEAD. in file:///home/robertc/source/baz/branch-hooks/
Robert Collins
robertc at robertcollins.net
Mon Feb 5 17:52:27 GMT 2007
------------------------------------------------------------
revno: 2248
revision-id: robertc at robertcollins.net-20070205175221-hi6pbqbplnekjoxh
parent: robertc at robertcollins.net-20070130231333-k74ok5fytvxy1c2j
parent: pqm at pqm.ubuntu.com-20070204124741-bc510e3fe6fb2962
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-hooks
timestamp: Tue 2007-02-06 04:52:21 +1100
message:
Update from HEAD.
added:
bzrlib/tests/branch_implementations/test_last_revision_info.py test_last_revision_i-20070201133317-51mzi40m8hv1i0i9-1
bzrlib/tests/repository_implementations/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/test_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
renamed:
bzrlib/win32console.py => bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
tools/win32/bzr_postinstall.py bzr_postinstall.py-20060622100836-b3yup582rt3y0nvm-6
tools/win32/start_bzr.bat start_bzr.bat-20060622100836-b3yup582rt3y0nvm-9
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 2246.1.15
merged: pqm at pqm.ubuntu.com-20070204124741-bc510e3fe6fb2962
parent: pqm at pqm.ubuntu.com-20070203195358-c2d9c5b94445119b
parent: robertc at robertcollins.net-20070204123551-yw876d2dmdhyb3nw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-02-04 12:47:41 +0000
message:
(robertc) Move info stats gathering into Repository.gather_stats allowing server optimisation.
------------------------------------------------------------
revno: 2246.1.14.1.1
merged: robertc at robertcollins.net-20070204123551-yw876d2dmdhyb3nw
parent: pqm at pqm.ubuntu.com-20070203195358-c2d9c5b94445119b
parent: robertc at robertcollins.net-20070203105604-z5stj4qy1r038m7x
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sun 2007-02-04 23:35:51 +1100
message:
(robertc) Move info stats gathering into Repository.gather_stats allowing server optimisation.
------------------------------------------------------------
revno: 2246.1.12.1.2
merged: robertc at robertcollins.net-20070203105604-z5stj4qy1r038m7x
parent: robertc at robertcollins.net-20070203100211-bf9qwy73gh40nszi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss.api.changes
timestamp: Sat 2007-02-03 21:56:04 +1100
message:
New version of gather_stats which gathers aggregate data too.
------------------------------------------------------------
revno: 2246.1.12.1.1
merged: robertc at robertcollins.net-20070203100211-bf9qwy73gh40nszi
parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss.api.changes
timestamp: Sat 2007-02-03 21:02:11 +1100
message:
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
------------------------------------------------------------
revno: 2246.1.14
merged: pqm at pqm.ubuntu.com-20070203195358-c2d9c5b94445119b
parent: pqm at pqm.ubuntu.com-20070203162012-b09dab5423fa3c50
parent: bialix at ukr.net-20070203073605-xkzsgkm13bgmmdkf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-02-03 19:53:58 +0000
message:
(bialix) win32-related selftest fixes (r=john)
------------------------------------------------------------
revno: 2240.1.3
merged: bialix at ukr.net-20070203073605-xkzsgkm13bgmmdkf
parent: bialix at ukr.net-20070128181932-css19mjca9nyt8cn
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Sat 2007-02-03 09:36:05 +0200
message:
win32: skip tests that try to use funky chars in fileid in Weave-based repositories
------------------------------------------------------------
revno: 2240.1.2
merged: bialix at ukr.net-20070128181932-css19mjca9nyt8cn
parent: bialix at ukr.net-20070128181553-rtyivph5j4xn1yle
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Sun 2007-01-28 20:19:32 +0200
message:
test_contents_merge2: skip this test on win32
------------------------------------------------------------
revno: 2240.1.1
merged: bialix at ukr.net-20070128181553-rtyivph5j4xn1yle
parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.fixes
timestamp: Sun 2007-01-28 20:15:53 +0200
message:
test_external_diff_binary: run external diff with --binary flag
------------------------------------------------------------
revno: 2246.1.13
merged: pqm at pqm.ubuntu.com-20070203162012-b09dab5423fa3c50
parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
parent: bialix at ukr.net-20070203150206-wvlmm64itjghmm1w
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-02-03 16:20:12 +0000
message:
(bialix) Support for Windows 98
------------------------------------------------------------
revno: 2245.4.11
merged: bialix at ukr.net-20070203150206-wvlmm64itjghmm1w
parent: bialix at ukr.net-20070202091430-vdgouvazded1yfqw
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Sat 2007-02-03 17:02:06 +0200
message:
Small fixes after John's review; added NEWS entry
------------------------------------------------------------
revno: 2245.4.10
merged: bialix at ukr.net-20070202091430-vdgouvazded1yfqw
parent: bialix at ukr.net-20070201133216-a0wm6nuylfjgqsh7
parent: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Fri 2007-02-02 11:14:30 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2245.4.9
merged: bialix at ukr.net-20070201133216-a0wm6nuylfjgqsh7
parent: bialix at ukr.net-20070131115836-lqp9u79n2t8xk3eg
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Thu 2007-02-01 15:32:16 +0200
message:
Inno Setup script: using {cmd} macro instead of env varibale substitution (%COMSPEC%)
------------------------------------------------------------
revno: 2245.4.8
merged: bialix at ukr.net-20070131115836-lqp9u79n2t8xk3eg
parent: bialix at ukr.net-20070130230535-kx1rd478rtigyc3v
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-01-31 13:58:36 +0200
message:
bzr_postinstall.py: on win98 path added to autoexec.bat should have 8.3 form
------------------------------------------------------------
revno: 2245.4.7
merged: bialix at ukr.net-20070130230535-kx1rd478rtigyc3v
parent: bialix at ukr.net-20070130151852-pahtk2exx9f1jff9
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-01-31 01:05:35 +0200
message:
standalone installer: win98 support
------------------------------------------------------------
revno: 2245.4.6
merged: bialix at ukr.net-20070130151852-pahtk2exx9f1jff9
parent: bialix at ukr.net-20070130124550-gggzj7fx8forp9gy
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Tue 2007-01-30 17:18:52 +0200
message:
osutils.py: terminal_width() now use win32utils.get_console_size()
------------------------------------------------------------
revno: 2245.4.5
merged: bialix at ukr.net-20070130124550-gggzj7fx8forp9gy
parent: bialix at ukr.net-20070130121318-a03bj0mol21o1rup
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Tue 2007-01-30 14:45:50 +0200
message:
bzr-win32-bdist-postinstall.py: good win98 support
------------------------------------------------------------
revno: 2245.4.4
merged: bialix at ukr.net-20070130121318-a03bj0mol21o1rup
parent: bialix at ukr.net-20070130120420-ab6pl6xjl973ujrf
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Tue 2007-01-30 14:13:18 +0200
message:
setup.py: fix plain 'python setup.py install' for win98
------------------------------------------------------------
revno: 2245.4.3
merged: bialix at ukr.net-20070130120420-ab6pl6xjl973ujrf
parent: bialix at ukr.net-20070130105138-280dj0ayzeh886rb
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Tue 2007-01-30 14:04:20 +0200
message:
config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
------------------------------------------------------------
revno: 2245.4.2
merged: bialix at ukr.net-20070130105138-280dj0ayzeh886rb
parent: bialix at ukr.net-20070130105014-cc3qlr06htp2zddv
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Tue 2007-01-30 12:51:38 +0200
message:
trace.py: open_tracefile(): win98-compatible detection of location for .bzr.log
It's also change default location of .bzr.log on Windows 2000/XP as well:
now it in user's My Documents folder, so it's much better
for users without administarator priveleges.
Also workaround win32-specific issue with file.tell().
------------------------------------------------------------
revno: 2245.4.1
merged: bialix at ukr.net-20070130105014-cc3qlr06htp2zddv
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Tue 2007-01-30 12:50:14 +0200
message:
win32utils: Windows-specific functions that use Win32 API via ctypes
------------------------------------------------------------
revno: 2246.1.12
merged: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
parent: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
parent: robertc at robertcollins.net-20070202203028-q6hq7cjxggr6yj3g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-02-02 20:49:50 +0000
message:
(robertc) Merge support for import bzrlib.plugins.NAME.
------------------------------------------------------------
revno: 2246.1.11.1.1
merged: robertc at robertcollins.net-20070202203028-q6hq7cjxggr6yj3g
parent: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
parent: robertc at robertcollins.net-20070202202753-uu1ixgssi7471vi9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2007-02-03 07:30:28 +1100
message:
(robertc) Merge support for import bzrlib.plugins.NAME.
------------------------------------------------------------
revno: 2246.1.10.2.3
merged: robertc at robertcollins.net-20070202202753-uu1ixgssi7471vi9
parent: robertc at robertcollins.net-20070202161755-zy2d68928wqwehj6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: plugin-import
timestamp: Sat 2007-02-03 07:27:53 +1100
message:
Review feedback.
------------------------------------------------------------
revno: 2246.1.10.2.2
merged: robertc at robertcollins.net-20070202161755-zy2d68928wqwehj6
parent: robertc at robertcollins.net-20070202104806-2lfxhf4zsocxuc43
committer: Robert Collins <robertc at robertcollins.net>
branch nick: plugin-hook
timestamp: Sat 2007-02-03 03:17:55 +1100
message:
Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not
yet been loaded by load_plugins(). This allows plugins to depend on each
other for code reuse without requiring users to perform file-renaming
gymnastics. (Robert Collins)
------------------------------------------------------------
revno: 2246.1.10.2.1
merged: robertc at robertcollins.net-20070202104806-2lfxhf4zsocxuc43
parent: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: plugin-hook
timestamp: Fri 2007-02-02 21:48:06 +1100
message:
Cleanup commented out cruft in plugin tests.
------------------------------------------------------------
revno: 2246.1.11
merged: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
parent: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
parent: robertc at robertcollins.net-20070202091723-xtak1zzhe2ylwksa
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-02-02 10:16:52 +0000
message:
(robertc) Merge new Branch.last_revision_info method.
------------------------------------------------------------
revno: 2246.1.10.1.1
merged: robertc at robertcollins.net-20070202091723-xtak1zzhe2ylwksa
parent: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
parent: larstiq at larstiq.dyndns.org-20070201144747-3szl1p7drs9v1hkh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2007-02-02 20:17:23 +1100
message:
(robertc) Merge new Branch.last_revision_info method.
------------------------------------------------------------
revno: 2246.1.3.4.2
merged: larstiq at larstiq.dyndns.org-20070201144747-3szl1p7drs9v1hkh
parent: larstiq at larstiq.dyndns.org-20070201133345-5hsm5hxzqbvmtklr
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: tip.info
timestamp: Thu 2007-02-01 15:47:47 +0100
message:
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
(Wouter van Heyst, Robert Collins)
------------------------------------------------------------
revno: 2246.1.3.4.1
merged: larstiq at larstiq.dyndns.org-20070201133345-5hsm5hxzqbvmtklr
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: tip.info
timestamp: Thu 2007-02-01 14:33:45 +0100
message:
New Branch.last_revision_info method, this is being done to allow
optimization of requests for both the number of revisions and the last
revision of a branch with smartservers and potentially future branch
formats. (Wouter van Heyst, Robert Collins)
------------------------------------------------------------
revno: 2246.1.10
merged: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
parent: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
parent: aaron.bentley at utoronto.ca-20070202043256-g5isx794qet9sxrd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-02-02 06:10:04 +0000
message:
remove default repository format, deprecate get_format_type
------------------------------------------------------------
revno: 2246.1.9.1.1
merged: aaron.bentley at utoronto.ca-20070202043256-g5isx794qet9sxrd
parent: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
parent: abentley at panoramicfeedback.com-20070126221558-yvlrk159l9ctsn8p
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Thu 2007-02-01 23:32:56 -0500
message:
Merge my own bundle
------------------------------------------------------------
revno: 2204.4.13.1.5
merged: abentley at panoramicfeedback.com-20070126221558-yvlrk159l9ctsn8p
parent: abentley at panoramicfeedback.com-20070126215616-3rwy48ob0qfkcj3j
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Fri 2007-01-26 17:15:58 -0500
message:
Remove RepositoryFormat.set_default_format, deprecate get_format_type
------------------------------------------------------------
revno: 2204.4.13.1.4
merged: abentley at panoramicfeedback.com-20070126215616-3rwy48ob0qfkcj3j
parent: abentley at panoramicfeedback.com-20070117221420-njgdmqom87nsjrlx
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Fri 2007-01-26 16:56:16 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2204.4.13.1.3
merged: abentley at panoramicfeedback.com-20070117221420-njgdmqom87nsjrlx
parent: abentley at panoramicfeedback.com-20070109140826-3qm6nlgvbv5tp62c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-registry
timestamp: Wed 2007-01-17 17:14:20 -0500
message:
zap old repository default handling
------------------------------------------------------------
revno: 2246.1.9
merged: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
parent: pqm at pqm.ubuntu.com-20070201234808-3b1302d73474bd8c
parent: john at arbash-meinel.com-20070201212919-s0s8iwvi8lowk0w0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 23:59:51 +0000
message:
(John Arbash Meinel) Fix bug #82158: 'bzr annotate' should use dotted revnos from the Branch
------------------------------------------------------------
revno: 2245.3.3
merged: john at arbash-meinel.com-20070201212919-s0s8iwvi8lowk0w0
parent: john at arbash-meinel.com-20070201163300-jp0cs02xz90leqpf
parent: pqm at pqm.ubuntu.com-20070201203641-a125a85aee82c725
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_revnos
timestamp: Thu 2007-02-01 15:29:19 -0600
message:
[merge] bzr.dev 2252
------------------------------------------------------------
revno: 2245.3.2
merged: john at arbash-meinel.com-20070201163300-jp0cs02xz90leqpf
parent: john at arbash-meinel.com-20070129211128-hg0myfxd22jwg38t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_revnos
timestamp: Thu 2007-02-01 10:33:00 -0600
message:
Cleanup according to Wouter's suggestions.
------------------------------------------------------------
revno: 2245.3.1
merged: john at arbash-meinel.com-20070129211128-hg0myfxd22jwg38t
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate_revnos
timestamp: Mon 2007-01-29 15:11:28 -0600
message:
bzr annotate should use Branch's dotted revnos.
Not the dotted revnos from the last modification of the file.
------------------------------------------------------------
revno: 2246.1.8
merged: pqm at pqm.ubuntu.com-20070201234808-3b1302d73474bd8c
parent: pqm at pqm.ubuntu.com-20070201213634-0d00da7ab00bf788
parent: abentley at panoramicfeedback.com-20070201203613-d2q6ngpvkt72ww5g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 23:48:08 +0000
message:
Display changes made by revert
------------------------------------------------------------
revno: 2225.1.6
merged: abentley at panoramicfeedback.com-20070201203613-d2q6ngpvkt72ww5g
parent: abentley at panoramicfeedback.com-20070201140415-trnf1722qqwj2pg4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: revert
timestamp: Thu 2007-02-01 15:36:13 -0500
message:
Update blackbox test
------------------------------------------------------------
revno: 2225.1.5
merged: abentley at panoramicfeedback.com-20070201140415-trnf1722qqwj2pg4
parent: abentley at panoramicfeedback.com-20070110151219-52c5x0sp1qn04viv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: revert
timestamp: Thu 2007-02-01 09:04:15 -0500
message:
Clean up whitespace changes
------------------------------------------------------------
revno: 2225.1.4
merged: abentley at panoramicfeedback.com-20070110151219-52c5x0sp1qn04viv
parent: abentley at panoramicfeedback.com-20070110150931-v46vbzmx0kfg5ggk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: revert
timestamp: Wed 2007-01-10 10:12:19 -0500
message:
PEP8 cleanup
------------------------------------------------------------
revno: 2225.1.3
merged: abentley at panoramicfeedback.com-20070110150931-v46vbzmx0kfg5ggk
parent: abentley at panoramicfeedback.com-20070110150506-v9731hp13vdksj23
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: revert
timestamp: Wed 2007-01-10 10:09:31 -0500
message:
change method names to assertFoo
------------------------------------------------------------
revno: 2225.1.2
merged: abentley at panoramicfeedback.com-20070110150506-v9731hp13vdksj23
parent: abentley at panoramicfeedback.com-20070110140801-ixdm903ldjr4emik
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: revert
timestamp: Wed 2007-01-10 10:05:06 -0500
message:
Ensure that changes are detected correctly
------------------------------------------------------------
revno: 2225.1.1
merged: abentley at panoramicfeedback.com-20070110140801-ixdm903ldjr4emik
parent: pqm at pqm.ubuntu.com-20070105024018-b849a96645a25c39
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: revert
timestamp: Wed 2007-01-10 09:08:01 -0500
message:
Added revert change display, with tests
------------------------------------------------------------
revno: 2246.1.7
merged: pqm at pqm.ubuntu.com-20070201213634-0d00da7ab00bf788
parent: pqm at pqm.ubuntu.com-20070201203641-a125a85aee82c725
parent: john at arbash-meinel.com-20070201154007-bnxh3uexaq659ad6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 21:36:34 +0000
message:
(John Arbash Meinel) suggest using 'bzr pull' if merging into a branch with no commits.
------------------------------------------------------------
revno: 2246.1.3.3.1
merged: john at arbash-meinel.com-20070201154007-bnxh3uexaq659ad6
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: no-commits-errors
timestamp: Thu 2007-02-01 09:40:07 -0600
message:
Mention using 'bzr pull' if there are no commits in current branch
------------------------------------------------------------
revno: 2246.1.6
merged: pqm at pqm.ubuntu.com-20070201203641-a125a85aee82c725
parent: pqm at pqm.ubuntu.com-20070201202403-7e92ef4d6842ba85
parent: john at arbash-meinel.com-20070201144953-d877vy9zbvxr5q98
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 20:36:41 +0000
message:
(John Arbash Meinel) hard-code the whitespace chars to avoid problems in some locales.
------------------------------------------------------------
revno: 2246.1.3.2.1
merged: john at arbash-meinel.com-20070201144953-d877vy9zbvxr5q98
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-02-01 08:49:53 -0600
message:
(John Arbash Meinel) hard-code the whitespace chars to avoid problems in some locales.
------------------------------------------------------------
revno: 2246.1.5
merged: pqm at pqm.ubuntu.com-20070201202403-7e92ef4d6842ba85
parent: pqm at pqm.ubuntu.com-20070201175351-9ba49ec1a0744c97
parent: abentley at panoramicfeedback.com-20070201145904-nrzbl3vkwjssrkhb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 20:24:03 +0000
message:
Treat Permission Denied as a lock failure, not lock contention
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.4
merged: abentley at panoramicfeedback.com-20070201145904-nrzbl3vkwjssrkhb
parent: abentley at panoramicfeedback.com-20070131184912-1n4p0avc2qw5qyax
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-02-01 09:59:04 -0500
message:
Update to skip on win32
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.3
merged: abentley at panoramicfeedback.com-20070131184912-1n4p0avc2qw5qyax
parent: aaron.bentley at utoronto.ca-20070131035136-exu2pa898yr2gzen
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-01-31 13:49:12 -0500
message:
Lock attempts don't treat permission problems as lock contention
------------------------------------------------------------
revno: 2246.1.4
merged: pqm at pqm.ubuntu.com-20070201175351-9ba49ec1a0744c97
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
parent: robertc at robertcollins.net-20070201171842-aw4059y8znmigwgn
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 17:53:51 +0000
message:
(robertc) Split branch pushing out of branch pulling.
------------------------------------------------------------
revno: 2246.1.3.1.1
merged: robertc at robertcollins.net-20070201171842-aw4059y8znmigwgn
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
parent: robertc at robertcollins.net-20070130211105-u8p44qh31vsn4xh3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2007-02-02 04:18:42 +1100
message:
(robertc) Split branch pushing out of branch pulling.
------------------------------------------------------------
revno: 2246.1.3
merged: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
parent: pqm at pqm.ubuntu.com-20070131165725-e3091cb8d282ef90
parent: john at arbash-meinel.com-20070131174855-gxkjd9rvy17uc6ko
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-31 18:40:47 +0000
message:
(John Arbash Meinel) switch from looping over f.write() to f.writelines()
------------------------------------------------------------
revno: 2246.1.1.1.2
merged: john at arbash-meinel.com-20070131174855-gxkjd9rvy17uc6ko
parent: john at arbash-meinel.com-20070131163348-kkwfh7hvvm39tx8y
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-01-31 11:48:55 -0600
message:
Switch from for line in foo: f.write(line) to f.writelines(foo)
------------------------------------------------------------
revno: 2246.1.2
merged: pqm at pqm.ubuntu.com-20070131165725-e3091cb8d282ef90
parent: pqm at pqm.ubuntu.com-20070131140456-56881c31a01089a3
parent: john at arbash-meinel.com-20070131163348-kkwfh7hvvm39tx8y
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-31 16:57:25 +0000
message:
fix --Derror => -Derror (trivial)
------------------------------------------------------------
revno: 2246.1.1.1.1
merged: john at arbash-meinel.com-20070131163348-kkwfh7hvvm39tx8y
parent: pqm at pqm.ubuntu.com-20070131140456-56881c31a01089a3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-01-31 10:33:48 -0600
message:
fix --Derror => -Derror (trivial)
------------------------------------------------------------
revno: 2246.1.1
merged: pqm at pqm.ubuntu.com-20070131140456-56881c31a01089a3
parent: pqm at pqm.ubuntu.com-20070130211230-64c2d9b4bce9304f
parent: aaron.bentley at utoronto.ca-20070131035136-exu2pa898yr2gzen
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-01-31 14:04:56 +0000
message:
Handle merge with dangling inventory entries
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.2
merged: aaron.bentley at utoronto.ca-20070131035136-exu2pa898yr2gzen
parent: aaron.bentley at utoronto.ca-20070131020421-a9fhra61hiwr0kcb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-01-30 22:51:36 -0500
message:
Handle merge with dangling inventory entries
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.1
merged: aaron.bentley at utoronto.ca-20070131020421-a9fhra61hiwr0kcb
parent: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-01-30 21:04:21 -0500
message:
Merge bzr.dev
Diff too large for email (2839, the limit is 1000).
More information about the bazaar-commits
mailing list