Rev 208: merge trunk. in
/home/robertc/source/baz/plugins/bzrtools/launchpad/
Robert Collins
robertc at robertcollins.net
Wed Mar 8 01:10:40 GMT 2006
------------------------------------------------------------
revno: 208
revision-id: robertc at robertcollins.net-20060308011037-3e3c931f9edf02f9
parent: robertc at robertcollins.net-20060224205407-f0a4ad979d2d3509
parent: robertc at robertcollins.net-20060307233714-79a35108099f3766
committer: Robert Collins <robertc at robertcollins.net>
branch nick: launchpad
timestamp: Wed 2006-03-08 12:10:37 +1100
message:
merge trunk.
added:
.be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/ aa3f38e88544498f893edec21b1b8f13-20051203235200-1a279f547e811dbd
.be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments/ comments-20051203235327-f2492ea5739c37e9
.be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments/e53c2ce1-5b28-4e48-8453-bad891786713/ e53c2ce15b284e488453bad891786713-20051203235328-367a3c2c0850e339
.be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments/e53c2ce1-5b28-4e48-8453-bad891786713/body body-20051203235329-a6614ce948ef642e
.be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments/e53c2ce1-5b28-4e48-8453-bad891786713/values values-20051203235328-8b38ff7ef613b371
.be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/values values-20051203235200-f1c02ce806c1f22b
test.py test.py-20051213140710-76604beaf6a2d0cf
renamed:
annotate.py => obsolete/annotate.py annotate.py-20050614162304-193ef00d6fe557e7
modified:
INSTALL INSTALL-20050507104657-93be314e40bb52a9
NEWS NEWS-20050607185005-1d99ddda6117a97e
README README-20050503015107-238050d346fcbb08
__init__.py __init__.py-20051019101947-f758f1a696725014
baz_import.py baz_import.py-20050614155149-bd6a5b1bff67db25
blackbox.py blackbox.py-20051024040435-607c5e197ca2b9d8
branchhistory.py ancestry.py-20051129154454-419cfcc7ab46eb80
bzrtools.py scriptlib.py-20050501073634-776a13caa8838cf4
clean_tree.py clean_tree.py-20050827022328-5ba46e22d074695c
diffstat.py diffstat.py-20051024151608-a54f0687ba271711
dotgraph.py pastegraph.cgi-20050830145741-bd23322c9fd3ba65
fetch_ghosts.py fetch_missing.py-20050903220502-5529ef03979a5b29
graph.py graph.py-20050830163250-0e1e9231f278d221
push.py push.py-20050613212944-7a14fd8687480ba6
shelf.py shelf.py-20050525150501-c9479ac0bac3d0f6
shelf_tests.py tests.py-20051019130958-0edcded95321bddd
shell.py shell.py-20051027040441-2911d8e8e5673742
tests/__init__.py __init__.py-20050907130235-e51cb61888e9e4f5
tests/test_baz_import.py test_baz_import.py-20050907130235-b4060b7dfae6a3e6
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307233714-79a35108099f3766
parent: robertc at robertcollins.net-20060307071054-30bcc931e22c0c3c
parent: abentley at panoramicfeedback.com-20060307172508-5e790d4de816d62f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Wed 2006-03-08 10:37:14 +1100
message:
Merge from ab-baz2bzr.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307172508-5e790d4de816d62f
parent: abentley at panoramicfeedback.com-20060307170739-6574fb4085c5f4fe
parent: abentley at panoramicfeedback.com-20060307172304-81a37ded2450ce99
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2006-03-07 12:25:08 -0500
message:
Merge fixes to test suite
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307172304-81a37ded2450ce99
parent: abentley at panoramicfeedback.com-20060307152150-f0e4f0174eb6d241
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2006-03-07 12:23:04 -0500
message:
Fixed up Robert's test changes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307152150-f0e4f0174eb6d241
parent: abentley at panoramicfeedback.com-20060306155642-1305ad508a608acc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2006-03-07 10:21:50 -0500
message:
Applied Robert's random fixes as non-merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060306155642-1305ad508a608acc
parent: abentley at panoramicfeedback.com-20060302141119-7a5ee02eb6483c50
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Mon 2006-03-06 10:56:42 -0500
message:
Forced dot output to UTF-8
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060302141119-7a5ee02eb6483c50
parent: abentley at panoramicfeedback.com-20060301211658-91ae24db2df6c1d6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Thu 2006-03-02 09:11:19 -0500
message:
Only use the decorated push if it's likely to work.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060301211658-91ae24db2df6c1d6
parent: abentley at panoramicfeedback.com-20060228224001-6df8720681c78694
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Wed 2006-03-01 16:16:58 -0500
message:
Updated to match new bzr diff behaviour
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060228224001-6df8720681c78694
parent: abentley at panoramicfeedback.com-20060223171709-a3c800b4a4793dc8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2006-02-28 17:40:01 -0500
message:
Update to new run_argv_aliases API
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060223171709-a3c800b4a4793dc8
parent: abentley at panoramicfeedback.com-20060221172251-ab59d78ef48566ed
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Thu 2006-02-23 12:17:09 -0500
message:
Updated to match new run_argv signature
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221172251-ab59d78ef48566ed
parent: aaron.bentley at utoronto.ca-20060221055115-d1a74f28c9016983
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2006-02-21 12:22:51 -0500
message:
Fixed fetching code to use Branch.fetch
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221055115-d1a74f28c9016983
parent: aaron.bentley at utoronto.ca-20060221053413-8c798afd3a32ccb1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools
timestamp: Tue 2006-02-21 00:51:15 -0500
message:
Fixed the push command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221053413-8c798afd3a32ccb1
parent: aaron.bentley at utoronto.ca-20060221051652-ca1320e2ffc398df
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools
timestamp: Tue 2006-02-21 00:34:13 -0500
message:
Fixed last step of push
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221051652-ca1320e2ffc398df
parent: aaron.bentley at utoronto.ca-20060221050807-3cc86585e1ec6edc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools
timestamp: Tue 2006-02-21 00:16:52 -0500
message:
fixed push
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221050807-3cc86585e1ec6edc
parent: aaron.bentley at utoronto.ca-20060221040427-70ecc1e24f2c4e80
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools
timestamp: Tue 2006-02-21 00:08:07 -0500
message:
Updated to match API changes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221040427-70ecc1e24f2c4e80
parent: abentley at panoramicfeedback.com-20060215201102-da90b229c8300506
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools
timestamp: Mon 2006-02-20 23:04:27 -0500
message:
forced ancestry graph to use utf-8 Dot output
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060215201102-da90b229c8300506
parent: aaron.bentley at utoronto.ca-20060201043221-de8e6754ea0b8fcf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Wed 2006-02-15 15:11:02 -0500
message:
Updated rsync test to make no assumptions about cwd
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060201043221-de8e6754ea0b8fcf
parent: aaron.bentley at utoronto.ca-20060201042835-0ff0d7af60662f20
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools
timestamp: Tue 2006-01-31 23:32:21 -0500
message:
Fixed fetch-ghosts
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060201042835-0ff0d7af60662f20
parent: aaron.bentley at utoronto.ca-20060201034019-6f9148fb037de1f1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools
timestamp: Tue 2006-01-31 23:28:35 -0500
message:
Fixed graph-ancestry
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060201034019-6f9148fb037de1f1
parent: aaron.bentley at utoronto.ca-20060201033733-df5441ce73162009
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools
timestamp: Tue 2006-01-31 22:40:19 -0500
message:
got branch-history under test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060201033733-df5441ce73162009
parent: aaron.bentley at utoronto.ca-20060201014548-42b0ef6ad27f70fc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools
timestamp: Tue 2006-01-31 22:37:33 -0500
message:
Got selftest passing with storage API
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060201014548-42b0ef6ad27f70fc
parent: aaron.bentley at utoronto.ca-20060201014518-a5c4a58acc1a7edc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools
timestamp: Tue 2006-01-31 20:45:48 -0500
message:
0.7 release
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060201014518-a5c4a58acc1a7edc
parent: aaron.bentley at utoronto.ca-20060104030007-5a105ba7830e48ca
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools
timestamp: Tue 2006-01-31 20:45:18 -0500
message:
Updated NEWS
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060104030007-5a105ba7830e48ca
parent: abentley at panoramicfeedback.com-20051230175846-fc0ef16a74331408
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools
timestamp: Tue 2006-01-03 22:00:07 -0500
message:
Documentation updates
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051230175846-fc0ef16a74331408
parent: abentley at panoramicfeedback.com-20051216134253-632812e160315bc8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Fri 2005-12-30 12:58:46 -0500
message:
Added support for pushing with no working tree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051216134253-632812e160315bc8
parent: abentley at panoramicfeedback.com-20051214143305-42718d97f27c03bd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Fri 2005-12-16 08:42:53 -0500
message:
Updated test to match bzrlib
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051214143305-42718d97f27c03bd
parent: abentley at panoramicfeedback.com-20051213165459-e7785dda3c5605c6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Wed 2005-12-14 09:33:05 -0500
message:
Avoided leaving junk all over the place when running standalone tests.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051213165459-e7785dda3c5605c6
parent: abentley at panoramicfeedback.com-20051213155055-afd340589db2e303
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2005-12-13 11:54:59 -0500
message:
Updated docs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051213155055-afd340589db2e303
parent: abentley at panoramicfeedback.com-20051212174728-982962afa21ee7f8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2005-12-13 10:50:55 -0500
message:
Added stand-alone tester
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051212174728-982962afa21ee7f8
parent: abentley at panoramicfeedback.com-20051212165940-f1e2875b71f848ab
parent: daf at rhydd.org-20051212173014-05de440fa1299343
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Mon 2005-12-12 12:47:28 -0500
message:
Applied typo fix
------------------------------------------------------------
merged: daf at rhydd.org-20051212173014-05de440fa1299343
parent: daf at rhydd.org-20051212172746-9f43628af8d8f004
parent: abentley at panoramicfeedback.com-20051212165940-f1e2875b71f848ab
committer: Dafydd Harries <daf at rhydd.org>
branch nick: bzrtools
timestamp: Mon 2005-12-12 17:30:14 +0000
message:
Merge from Aaron.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051212165940-f1e2875b71f848ab
parent: abentley at panoramicfeedback.com-20051206204100-0b468f1764f2afb5
parent: daf at rhydd.org-20051212162947-30190c9537f106d1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Mon 2005-12-12 11:59:40 -0500
message:
Fix for extremely long filenames in shelve
------------------------------------------------------------
merged: daf at rhydd.org-20051212162947-30190c9537f106d1
parent: daf at rhydd.org-20051212160942-b83032154287126d
committer: Dafydd Harries <daf at rhydd.org>
branch nick: bzrtools
timestamp: Mon 2005-12-12 16:29:47 +0000
message:
Use a minimum graphwidth of 10.
This also fixes the previously still broken case of graphwidth == 0.
------------------------------------------------------------
merged: daf at rhydd.org-20051212160942-b83032154287126d
parent: abentley at panoramicfeedback.com-20051206204100-0b468f1764f2afb5
committer: Dafydd Harries <daf at rhydd.org>
branch nick: bzrtools
timestamp: Mon 2005-12-12 16:09:42 +0000
message:
Fix a bug in diffstat that causes an infinite loop on long filenames.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051206204100-0b468f1764f2afb5
parent: aaron.bentley at utoronto.ca-20051203212142-2dad12fcec98a895
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2005-12-06 15:41:00 -0500
message:
Updated graph-ancestry help
------------------------------------------------------------
merged: daf at rhydd.org-20051212172746-9f43628af8d8f004
parent: daf at rhydd.org-20051212162947-30190c9537f106d1
committer: Dafydd Harries <daf at rhydd.org>
branch nick: bzrtools
timestamp: Mon 2005-12-12 17:27:46 +0000
message:
Fix typo (s/changes/changed/).
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307170739-6574fb4085c5f4fe
parent: abentley at panoramicfeedback.com-20060307152315-42337454a0ad956b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2006-03-07 12:07:39 -0500
message:
Switched to blacnk branch-nicks
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307152315-42337454a0ad956b
parent: abentley at panoramicfeedback.com-20060307150329-b2c79effccfdd961
parent: abentley at panoramicfeedback.com-20060307152150-f0e4f0174eb6d241
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2006-03-07 10:23:15 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307150329-b2c79effccfdd961
parent: abentley at panoramicfeedback.com-20060307141349-09932daa892c0005
parent: robertc at robertcollins.net-20060307071054-30bcc931e22c0c3c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2006-03-07 10:03:29 -0500
message:
Merge from Robert
------------------------------------------------------------
merged: robertc at robertcollins.net-20060307071054-30bcc931e22c0c3c
parent: robertc at robertcollins.net-20060206010551-23512fc46e5562b1
parent: abentley at panoramicfeedback.com-20060303163547-cc1666d256b1a8d7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Tue 2006-03-07 18:10:54 +1100
message:
Merge from ab-baz2bzr
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060303163547-cc1666d256b1a8d7
parent: abentley at panoramicfeedback.com-20060302215016-7a4524fcb3b02649
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Fri 2006-03-03 11:35:47 -0500
message:
Added prefixes param to specify branches to import
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060302215016-7a4524fcb3b02649
parent: abentley at panoramicfeedback.com-20060302183807-ce34e84d08b9e9a7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Thu 2006-03-02 16:50:16 -0500
message:
Support creating repositories instead of standalone branches.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060302183807-ce34e84d08b9e9a7
parent: abentley at panoramicfeedback.com-20060302144607-d89730546997575c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Thu 2006-03-02 13:38:07 -0500
message:
Switched to using checkouts instead of branch copies
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060302144607-d89730546997575c
parent: abentley at panoramicfeedback.com-20060302144110-ef56e37f5cb21168
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Thu 2006-03-02 09:46:07 -0500
message:
Killed progress bar in tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060302144110-ef56e37f5cb21168
parent: abentley at panoramicfeedback.com-20060301161625-492d9e8ba16d8666
parent: abentley at panoramicfeedback.com-20060302141119-7a5ee02eb6483c50
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Thu 2006-03-02 09:41:10 -0500
message:
Merged -p1 updates.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060301161625-492d9e8ba16d8666
parent: abentley at panoramicfeedback.com-20060301160407-c8db0a2c02699dd2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Wed 2006-03-01 11:16:25 -0500
message:
Stopped using deprecated bzrlib functionality
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060301160407-c8db0a2c02699dd2
parent: abentley at panoramicfeedback.com-20060301154514-265911f7d80255f9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Wed 2006-03-01 11:04:07 -0500
message:
Stopped using deprecated PyBaz functionality
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060301154514-265911f7d80255f9
parent: abentley at panoramicfeedback.com-20060301141849-9e1cbde75e5099ce
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Wed 2006-03-01 10:45:14 -0500
message:
Reverted bzrtools.py to mainline version.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060301141849-9e1cbde75e5099ce
parent: abentley at panoramicfeedback.com-20060301141644-dabb411c8c886c23
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Wed 2006-03-01 09:18:49 -0500
message:
Removed unused import
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060301141644-dabb411c8c886c23
parent: abentley at panoramicfeedback.com-20060301134215-f343b0751787dfb9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Wed 2006-03-01 09:16:44 -0500
message:
Cleaned up baz_import and tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060301134215-f343b0751787dfb9
parent: abentley at panoramicfeedback.com-20060228185652-374bb521bcc8dc2d
parent: abentley at panoramicfeedback.com-20060228224001-6df8720681c78694
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Wed 2006-03-01 08:42:15 -0500
message:
Merge push fix
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060228185652-374bb521bcc8dc2d
parent: abentley at panoramicfeedback.com-20060228171759-7a97c3a9c12e97c8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2006-02-28 13:56:52 -0500
message:
Got imports working, via a big hammer
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060228171759-7a97c3a9c12e97c8
parent: aaron.bentley at utoronto.ca-20060201044239-7c17ea8d0a18eedb
parent: abentley at panoramicfeedback.com-20060223171709-a3c800b4a4793dc8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2006-02-28 12:17:59 -0500
message:
Got bzrtools almost working, except baz-import
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060201044239-7c17ea8d0a18eedb
parent: aaron.bentley at utoronto.ca-20051203235359-5134805afd538781
parent: aaron.bentley at utoronto.ca-20060201043221-de8e6754ea0b8fcf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools.baz2bzr
timestamp: Tue 2006-01-31 23:42:39 -0500
message:
Merge from bzrtools mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051203235359-5134805afd538781
parent: aaron.bentley at utoronto.ca-20051203212510-189717b33bc68494
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzrtools.baz2bzr
timestamp: Sat 2005-12-03 18:53:59 -0500
message:
Recorded Robey's bug
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060307141349-09932daa892c0005
parent: abentley at panoramicfeedback.com-20060303163547-cc1666d256b1a8d7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzrtools
timestamp: Tue 2006-03-07 09:13:49 -0500
message:
Handle NoWorkingTree too
More information about the bazaar-commits
mailing list