Rev 266: merge upstream changes. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
Jelmer Vernooij
jelmer at samba.org
Thu Feb 1 14:10:08 GMT 2007
At http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
------------------------------------------------------------
revno: 266
revision-id: jelmer at samba.org-20070201140904-wbok37h2amkxi590
parent: jelmer at samba.org-20070106232357-48ky0nd2e4aszen4
parent: jelmer at samba.org-20070129172100-rs072ggnyssuteyj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Thu 2007-02-01 15:09:04 +0100
message:
merge upstream changes.
added:
tests/test_errors.py test_errors.py-20070129114605-ban03f32t6ja14ez-1
modified:
AUTHORS AUTHORS-20060508114718-4c90c0062645106d
NEWS news-20061231030336-h9fhq245ie0de8bs-1
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
checkout.py workingtree.py-20060306120941-b083cb0fdd4a69de
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
format.py format.py-20060406233823-b6fa009fe35dfde7
mapping.txt mapping.txt-20060625151311-9ghaqrm71ajq593n-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
tests/test_tree.py test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
tests/test_upgrade.py test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
------------------------------------------------------------
revno: 236.1.11.1.169
merged: jelmer at samba.org-20070129172100-rs072ggnyssuteyj
parent: jelmer at samba.org-20070129151934-jx7h3df8ywl678md
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-29 18:21:00 +0100
message:
Fix errors testcases.
------------------------------------------------------------
revno: 236.1.11.1.168
merged: jelmer at samba.org-20070129151934-jx7h3df8ywl678md
parent: jelmer at samba.org-20070124141927-dksr08au224gomps
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-29 16:19:34 +0100
message:
Add tests for error code.
------------------------------------------------------------
revno: 236.1.11.1.167
merged: jelmer at samba.org-20070124141927-dksr08au224gomps
parent: jelmer at samba.org-20070124125639-8h9p6y3peumfb9p3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-01-24 15:19:27 +0100
message:
Warn about versions of sqlite that are too old.
------------------------------------------------------------
revno: 236.1.11.1.166
merged: jelmer at samba.org-20070124125639-8h9p6y3peumfb9p3
parent: jelmer at samba.org-20070122105054-po2g4eoaytunwege
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-01-24 13:56:39 +0100
message:
Fix import, thanks metze
------------------------------------------------------------
revno: 236.1.11.1.165
merged: jelmer at samba.org-20070122105054-po2g4eoaytunwege
parent: jelmer at samba.org-20070120231109-vq4a8bef2c9fscyu
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-22 11:50:54 +0100
message:
Run tests in __init__, for use with coverage.py
------------------------------------------------------------
revno: 236.1.11.1.164
merged: jelmer at samba.org-20070120231109-vq4a8bef2c9fscyu
parent: jelmer at samba.org-20070120230110-3qrbo5iqx7z56sdl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2007-01-21 00:11:09 +0100
message:
Disable working tree support when using an old version of python-subversion
------------------------------------------------------------
revno: 236.1.11.1.163
merged: jelmer at samba.org-20070120230110-3qrbo5iqx7z56sdl
parent: jelmer at samba.org-20070120224027-8bmtpksroz7awkla
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2007-01-21 00:01:10 +0100
message:
Implement get_revision_graph(None).
------------------------------------------------------------
revno: 236.1.11.1.162
merged: jelmer at samba.org-20070120224027-8bmtpksroz7awkla
parent: jelmer at samba.org-20070120181401-r8zj3xtwyezlnfnl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2007-01-20 23:40:27 +0100
message:
Move error conversion function to errors.py.
------------------------------------------------------------
revno: 236.1.11.1.161
merged: jelmer at samba.org-20070120181401-r8zj3xtwyezlnfnl
parent: jelmer at samba.org-20070120160208-rnrt8vo3m396330p
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2007-01-20 19:14:01 +0100
message:
Update NEWS
------------------------------------------------------------
revno: 236.1.11.1.160
merged: jelmer at samba.org-20070120160208-rnrt8vo3m396330p
parent: jelmer at samba.org-20070118193803-s4zr8hb59dupq9u4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2007-01-20 17:02:08 +0100
message:
Add check for pysqlite (fixes #80473).
------------------------------------------------------------
revno: 236.1.11.1.159
merged: jelmer at samba.org-20070118193803-s4zr8hb59dupq9u4
parent: jelmer at samba.org-20070118131914-sspamg4fv9c9mpv5
parent: larstiq at larstiq.dyndns.org-20070118164643-rrnsu7a3c1or16s8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Thu 2007-01-18 20:38:03 +0100
message:
Merge fix from Wouter.
------------------------------------------------------------
revno: 236.1.11.1.157.1.1
merged: larstiq at larstiq.dyndns.org-20070118164643-rrnsu7a3c1or16s8
parent: jelmer at samba.org-20070117140701-iu1fbunp0q8vb7i0
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr-svn
timestamp: Thu 2007-01-18 17:46:43 +0100
message:
Use fully qualified name for BzrError
------------------------------------------------------------
revno: 236.1.11.1.158
merged: jelmer at samba.org-20070118131914-sspamg4fv9c9mpv5
parent: jelmer at samba.org-20070117140701-iu1fbunp0q8vb7i0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Thu 2007-01-18 14:19:14 +0100
message:
Distinguish between branches and tags
------------------------------------------------------------
revno: 236.1.11.1.157
merged: jelmer at samba.org-20070117140701-iu1fbunp0q8vb7i0
parent: jelmer at samba.org-20070116101442-8ipstsewthjbimhp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-01-17 15:07:01 +0100
message:
Update for bzr.dev
------------------------------------------------------------
revno: 236.1.11.1.156
merged: jelmer at samba.org-20070116101442-8ipstsewthjbimhp
parent: jelmer at samba.org-20070116013721-adqxlwj1dl5jo7as
parent: jelmer at samba.org-20070115172815-93j1sk2ylwzh8tt9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-01-16 11:14:42 +0100
message:
Import version 3 changes.
------------------------------------------------------------
revno: 236.1.11.1.142.1.8
merged: jelmer at samba.org-20070115172815-93j1sk2ylwzh8tt9
parent: jelmer at samba.org-20070114055700-9ybu0e0sf0t2bsp9
parent: jelmer at samba.org-20070115133448-o4pcdn4dvzqu5u25
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: ver3
timestamp: Mon 2007-01-15 18:28:15 +0100
message:
Merge from upstream.
------------------------------------------------------------
revno: 236.1.11.1.142.1.7
merged: jelmer at samba.org-20070114055700-9ybu0e0sf0t2bsp9
parent: jelmer at samba.org-20070114030508-miy4yc1daskumby1
parent: jelmer at samba.org-20070114052234-aj73nfyj8sslv3n9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: ver3
timestamp: Sun 2007-01-14 06:57:00 +0100
message:
Fix remaining tests.
------------------------------------------------------------
revno: 236.1.11.1.142.1.6
merged: jelmer at samba.org-20070114030508-miy4yc1daskumby1
parent: jelmer at samba.org-20070114015613-yfjhkjcvl3fbt8b4
parent: jelmer at samba.org-20070110052456-z9werxhohglupk05
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: ver3
timestamp: Sun 2007-01-14 04:05:08 +0100
message:
merge from upstream
------------------------------------------------------------
revno: 236.1.11.1.142.1.5
merged: jelmer at samba.org-20070114015613-yfjhkjcvl3fbt8b4
parent: jelmer at samba.org-20070110035917-9w6ag249rblmg0oc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: ver3
timestamp: Sun 2007-01-14 02:56:13 +0100
message:
Fix some of the file id tests
------------------------------------------------------------
revno: 236.1.11.1.142.1.4
merged: jelmer at samba.org-20070110035917-9w6ag249rblmg0oc
parent: jelmer at samba.org-20070110015644-854iy6manxjo9zu0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: ver3
timestamp: Wed 2007-01-10 04:59:17 +0100
message:
Fix tests for new revision ids
------------------------------------------------------------
revno: 236.1.11.1.142.1.3
merged: jelmer at samba.org-20070110015644-854iy6manxjo9zu0
parent: jelmer at samba.org-20070110015533-0gsoakvowzntfbrl
parent: jelmer at samba.org-20070110015047-2it8mj9d7bclg2ju
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: ver3
timestamp: Wed 2007-01-10 02:56:44 +0100
message:
Merge upstream
------------------------------------------------------------
revno: 236.1.11.1.142.1.2
merged: jelmer at samba.org-20070110015533-0gsoakvowzntfbrl
parent: jelmer at samba.org-20070109030033-nv7e48u1jnuo7afi
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: ver3
timestamp: Wed 2007-01-10 02:55:33 +0100
message:
Follow new revision id format
------------------------------------------------------------
revno: 236.1.11.1.142.1.1
merged: jelmer at samba.org-20070109030033-nv7e48u1jnuo7afi
parent: jelmer at samba.org-20070109021631-r3tjo36qj4hu2f95
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: ver3
timestamp: Tue 2007-01-09 04:00:33 +0100
message:
Add specification for version 3
------------------------------------------------------------
revno: 236.1.11.1.155
merged: jelmer at samba.org-20070116013721-adqxlwj1dl5jo7as
parent: jelmer at samba.org-20070115133448-o4pcdn4dvzqu5u25
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-01-16 02:37:21 +0100
message:
Remove debug call
------------------------------------------------------------
revno: 236.1.11.1.154
merged: jelmer at samba.org-20070115133448-o4pcdn4dvzqu5u25
parent: jelmer at samba.org-20070115040110-rkf44wgfw2k3wzdo
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-15 14:34:48 +0100
message:
Attempt to keep parent file ids.
------------------------------------------------------------
revno: 236.1.11.1.153
merged: jelmer at samba.org-20070115040110-rkf44wgfw2k3wzdo
parent: jelmer at samba.org-20070115031521-e4ejwccyzei1kntf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-15 05:01:10 +0100
message:
Add progress bar, as this function can take a long time to run.
------------------------------------------------------------
revno: 236.1.11.1.152
merged: jelmer at samba.org-20070115031521-e4ejwccyzei1kntf
parent: jelmer at samba.org-20070115003937-mxyoa82zy1t616pi
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-15 04:15:21 +0100
message:
handle incremental calls to svn-upgrade nicely.
------------------------------------------------------------
revno: 236.1.11.1.151
merged: jelmer at samba.org-20070115003937-mxyoa82zy1t616pi
parent: jelmer at samba.org-20070114233809-pjrkm3wnr2ezy6eo
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-15 01:39:37 +0100
message:
The Python Subversion bindings have trouble dealing with unicode commit messages.
------------------------------------------------------------
revno: 236.1.11.1.150
merged: jelmer at samba.org-20070114233809-pjrkm3wnr2ezy6eo
parent: jelmer at samba.org-20070114052234-aj73nfyj8sslv3n9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-15 00:38:09 +0100
message:
Use global configuration object.
------------------------------------------------------------
revno: 236.1.11.1.149
merged: jelmer at samba.org-20070114052234-aj73nfyj8sslv3n9
parent: jelmer at samba.org-20070114041121-vbccc21zg45eu706
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2007-01-14 06:22:34 +0100
message:
svn segfaults on empty commits
------------------------------------------------------------
revno: 236.1.11.1.148
merged: jelmer at samba.org-20070114041121-vbccc21zg45eu706
parent: jelmer at samba.org-20070110052456-z9werxhohglupk05
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2007-01-14 05:11:21 +0100
message:
Some minor random changes
------------------------------------------------------------
revno: 236.1.11.1.147
merged: jelmer at samba.org-20070110052456-z9werxhohglupk05
parent: jelmer at samba.org-20070110015047-2it8mj9d7bclg2ju
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-01-10 06:24:56 +0100
message:
More efficient use of connection, fix bug when used with none-schemes and shared repositories
------------------------------------------------------------
revno: 236.1.11.1.146
merged: jelmer at samba.org-20070110015047-2it8mj9d7bclg2ju
parent: jelmer at samba.org-20070109055935-s7gvlge0suagjkee
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-01-10 02:50:47 +0100
message:
Support special characters in filenames in working trees.
------------------------------------------------------------
revno: 236.1.11.1.145
merged: jelmer at samba.org-20070109055935-s7gvlge0suagjkee
parent: jelmer at samba.org-20070109042501-mxmvqxudr3il7ym6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-01-09 06:59:35 +0100
message:
Use generate_revision_id() in more tests.
------------------------------------------------------------
revno: 236.1.11.1.144
merged: jelmer at samba.org-20070109042501-mxmvqxudr3il7ym6
parent: jelmer at samba.org-20070109032200-i8fd1603lsc4q1cm
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-01-09 05:25:01 +0100
message:
use new fns in testsuite
------------------------------------------------------------
revno: 236.1.11.1.143
merged: jelmer at samba.org-20070109032200-i8fd1603lsc4q1cm
parent: jelmer at samba.org-20070109021631-r3tjo36qj4hu2f95
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-01-09 04:22:00 +0100
message:
Add generate_revision_id function.
------------------------------------------------------------
revno: 236.1.11.1.142
merged: jelmer at samba.org-20070109021631-r3tjo36qj4hu2f95
parent: jelmer at samba.org-20070108173906-mgxopkju9itltfsb
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-01-09 03:16:31 +0100
message:
Add test that demonstrates a problem in the python repository
(invalid character in file name).
Simplify svn_unescape_path() by simply calling out to urllib.unquote()
------------------------------------------------------------
revno: 236.1.11.1.141
merged: jelmer at samba.org-20070108173906-mgxopkju9itltfsb
parent: jelmer at samba.org-20070108163623-wutkgf1ul9ef0kg1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-08 18:39:06 +0100
message:
Warn about incompatible svn versions
------------------------------------------------------------
revno: 236.1.11.1.140
merged: jelmer at samba.org-20070108163623-wutkgf1ul9ef0kg1
parent: jelmer at samba.org-20070108160335-ddcgxfqunj2fch2u
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-08 17:36:23 +0100
message:
Fix message_callback argument to commit()
------------------------------------------------------------
revno: 236.1.11.1.139
merged: jelmer at samba.org-20070108160335-ddcgxfqunj2fch2u
parent: jelmer at samba.org-20070108044938-qsw6iptrtrff0kw9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-08 17:03:35 +0100
message:
Fix file ids in checkouts.
------------------------------------------------------------
revno: 236.1.11.1.138
merged: jelmer at samba.org-20070108044938-qsw6iptrtrff0kw9
parent: jelmer at samba.org-20070108044556-wv5lracm68pkuw2d
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-08 05:49:38 +0100
message:
Fix segfault (no tests, requires a webdav repository to reproduce).
------------------------------------------------------------
revno: 236.1.11.1.137
merged: jelmer at samba.org-20070108044556-wv5lracm68pkuw2d
parent: jelmer at samba.org-20070108024856-wrhdhdetx909ouzl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-08 05:45:56 +0100
message:
Fix recognizing properties when reading the base revision in a subversion working copy. bzr status in a large tree (Samba) now takes ~15 seconds
------------------------------------------------------------
revno: 236.1.11.1.136
merged: jelmer at samba.org-20070108024856-wrhdhdetx909ouzl
parent: jelmer at samba.org-20070107004800-hfyerfcy9w1s2va6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-08 03:48:56 +0100
message:
Fix checkout tests.
------------------------------------------------------------
revno: 236.1.11.1.135
merged: jelmer at samba.org-20070107004800-hfyerfcy9w1s2va6
parent: jelmer at samba.org-20070106231146-r09j2k60av8uz1jf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2007-01-07 01:48:00 +0100
message:
Warn if data changed during an upgrade.
Diff too large for email (3540 lines, the limit is 1000).
More information about the bazaar-commits
mailing list