Rev 446: Merge upstream. in file:///data/jelmer/bzr-svn/nestedtrees/
Jelmer Vernooij
jelmer at samba.org
Sat Jul 21 12:44:58 BST 2007
At file:///data/jelmer/bzr-svn/nestedtrees/
------------------------------------------------------------
revno: 446
revision-id: jelmer at samba.org-20070721114455-tmlzl4xkxuiqp4ve
parent: jelmer at samba.org-20070721114332-dv5gy9udnhitsrb3
parent: jelmer at samba.org-20070721013413-8w20kk45rfhem657
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nestedtrees
timestamp: Sat 2007-07-21 13:44:55 +0200
message:
Merge upstream.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
README README-20051120210643-bd274a2fef9aed6a
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
cache.py cache.py-20070520185908-qbtlcet08bllgs0f-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
format.py format.py-20060406233823-b6fa009fe35dfde7
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_branchprops.py test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_config.py test_config.py-20070624193244-itvnst60evjidr4z-1
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
tests/test_transport.py test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.134
revision-id: jelmer at samba.org-20070721013413-8w20kk45rfhem657
parent: jelmer at samba.org-20070721012413-v513jr7hbh3oqdn1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2007-07-21 03:34:13 +0200
message:
Fix compatibility with 1.4 (tx_apply also appears to be available there but be different.)
modified:
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
------------------------------------------------------------
revno: 438.1.1.1.133
revision-id: jelmer at samba.org-20070721012413-v513jr7hbh3oqdn1
parent: jelmer at samba.org-20070720164022-5786c8gvw5z0mlyt
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2007-07-21 03:24:13 +0200
message:
Add some extra tests for file ids, update documentation. Set revision properties after changing root rather than before so they can be altered during the commit.
modified:
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 438.1.1.1.132
revision-id: jelmer at samba.org-20070720164022-5786c8gvw5z0mlyt
parent: jelmer at samba.org-20070720122718-519cdx6fbu1ykf49
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-20 18:40:22 +0200
message:
Start registering formats so they get tested by bzr.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.131
revision-id: jelmer at samba.org-20070720122718-519cdx6fbu1ykf49
parent: jelmer at samba.org-20070720023356-ak221851qv0qr2qw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-20 14:27:18 +0200
message:
More compatibility fixes for Subversion 1.5.
modified:
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
------------------------------------------------------------
revno: 438.1.1.1.130
revision-id: jelmer at samba.org-20070720023356-ak221851qv0qr2qw
parent: jelmer at samba.org-20070720002641-ehn7muboul57m36n
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-20 04:33:56 +0200
message:
Handle the fact that svn 1.5 returns a tuple rather than a singleton.
modified:
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
------------------------------------------------------------
revno: 438.1.1.1.129
revision-id: jelmer at samba.org-20070720002641-ehn7muboul57m36n
parent: jelmer at samba.org-20070720001747-rdg4ca7v90uzsxl5
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-20 02:26:41 +0200
message:
Support Subversion 1.5.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
README README-20051120210643-bd274a2fef9aed6a
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
------------------------------------------------------------
revno: 438.1.1.1.128
revision-id: jelmer at samba.org-20070720001747-rdg4ca7v90uzsxl5
parent: jelmer at samba.org-20070719233215-ajo3mbdjew2qhk4v
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-20 02:17:47 +0200
message:
Initial work on support for 1.5 interfaces.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
------------------------------------------------------------
revno: 438.1.1.1.127
revision-id: jelmer at samba.org-20070719233215-ajo3mbdjew2qhk4v
parent: jelmer at samba.org-20070719225311-xo5uapul9rny71y8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-20 01:32:15 +0200
message:
Import bzrlib for correctly displaying warnings.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.126
revision-id: jelmer at samba.org-20070719225311-xo5uapul9rny71y8
parent: jelmer at samba.org-20070719180935-n0aar9r1el5sxryl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-20 00:53:11 +0200
message:
Support wildcards in listbranching schemes
modified:
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
------------------------------------------------------------
revno: 438.1.1.1.125
revision-id: jelmer at samba.org-20070719180935-n0aar9r1el5sxryl
parent: jelmer at samba.org-20070719174334-1k2d4dhdkiy65m3j
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2007-07-19 20:09:35 +0200
message:
Fix tests.
modified:
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
------------------------------------------------------------
revno: 438.1.1.1.124
revision-id: jelmer at samba.org-20070719174334-1k2d4dhdkiy65m3j
parent: jelmer at samba.org-20070719173933-2wbrw5rww3p5sx5c
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2007-07-19 19:43:34 +0200
message:
always warn about missing subversion bindings.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 438.1.1.1.123
revision-id: jelmer at samba.org-20070719173933-2wbrw5rww3p5sx5c
parent: jelmer at samba.org-20070719173423-zs8qktejmpqkzwoy
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2007-07-19 19:39:33 +0200
message:
Error out when creating a new branch in a repository that already has revisions.
modified:
format.py format.py-20060406233823-b6fa009fe35dfde7
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
------------------------------------------------------------
revno: 438.1.1.1.122
revision-id: jelmer at samba.org-20070719173423-zs8qktejmpqkzwoy
parent: jelmer at samba.org-20070719161554-89gpjr8q3tpbmhu8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2007-07-19 19:34:23 +0200
message:
More work on intelligent guessing of branching schemes.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
format.py format.py-20060406233823-b6fa009fe35dfde7
repository.py repository.py-20060306123302-1f8c5069b3fe0265
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
------------------------------------------------------------
revno: 438.1.1.1.121
revision-id: jelmer at samba.org-20070719161554-89gpjr8q3tpbmhu8
parent: jelmer at samba.org-20070719154815-c0dg3b546yudw2jo
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2007-07-19 18:15:54 +0200
message:
Fix bug in scheme guessing code, add 'bzr help svn-branching-schemes'
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
------------------------------------------------------------
revno: 438.1.1.1.120
revision-id: jelmer at samba.org-20070719154815-c0dg3b546yudw2jo
parent: jelmer at samba.org-20070718170139-qow9ozku4vbpe7sy
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2007-07-19 17:48:15 +0200
message:
Improve heuristics for determining branching schemes.
modified:
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
format.py format.py-20060406233823-b6fa009fe35dfde7
repository.py repository.py-20060306123302-1f8c5069b3fe0265
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.119
revision-id: jelmer at samba.org-20070718170139-qow9ozku4vbpe7sy
parent: jelmer at samba.org-20070718133125-1hwf9vl6sr60hlup
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2007-07-18 19:01:39 +0200
message:
Add function for determining commit paths.
modified:
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
------------------------------------------------------------
revno: 438.1.1.1.118
revision-id: jelmer at samba.org-20070718133125-1hwf9vl6sr60hlup
parent: jelmer at samba.org-20070718130701-8f2c2dqh6acm0xjp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2007-07-18 15:31:25 +0200
message:
Update TODO.
modified:
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
------------------------------------------------------------
revno: 438.1.1.1.117
revision-id: jelmer at samba.org-20070718130701-8f2c2dqh6acm0xjp
parent: jelmer at samba.org-20070718122455-sc4k8bk4m3ay0sv2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2007-07-18 15:07:01 +0200
message:
Add --prefix option to svn-import.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
------------------------------------------------------------
revno: 438.1.1.1.116
revision-id: jelmer at samba.org-20070718122455-sc4k8bk4m3ay0sv2
parent: jelmer at samba.org-20070718120302-sv43uuk4d3l5jkzh
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2007-07-18 14:24:55 +0200
message:
Store urls without trailing slash.
modified:
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
------------------------------------------------------------
revno: 438.1.1.1.115
revision-id: jelmer at samba.org-20070718120302-sv43uuk4d3l5jkzh
parent: jelmer at samba.org-20070717222148-inu96spvtsqwns2u
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2007-07-18 14:03:02 +0200
message:
Update NEWS.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
------------------------------------------------------------
revno: 438.1.1.1.114
revision-id: jelmer at samba.org-20070717222148-inu96spvtsqwns2u
parent: jelmer at samba.org-20070717204931-t6vibqtun2g0n8yi
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2007-07-18 00:21:48 +0200
message:
Clearer error when branch specified as svn-import argument. (#121391)
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 438.1.1.1.113
revision-id: jelmer at samba.org-20070717204931-t6vibqtun2g0n8yi
parent: jelmer at samba.org-20070717201105-uglj36gl3m5wr0iw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2007-07-17 22:49:31 +0200
message:
Make sure right exceptions are raised.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 438.1.1.1.112
revision-id: jelmer at samba.org-20070717201105-uglj36gl3m5wr0iw
parent: jelmer at samba.org-20070717194431-sw030agm2ffbak7d
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2007-07-17 22:11:05 +0200
message:
Fix some broken tests.
modified:
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
------------------------------------------------------------
revno: 438.1.1.1.111
revision-id: jelmer at samba.org-20070717194431-sw030agm2ffbak7d
parent: jelmer at samba.org-20070717154609-pg9dvzz8clzgg7io
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2007-07-17 21:44:31 +0200
message:
Make sure last_revnum isn't cached, make proving a revid isn't present quicker.
modified:
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
format.py format.py-20060406233823-b6fa009fe35dfde7
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.110
revision-id: jelmer at samba.org-20070717154609-pg9dvzz8clzgg7io
parent: jelmer at samba.org-20070717154512-b4dktwqr6gxvex2s
parent: mss at mawhrin.net-20070716200940-xb6ux2ct3hovghc4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2007-07-17 17:46:09 +0200
message:
Merge README update from Mikhail Sobolev.
modified:
cache.py cache.py-20070520185908-qbtlcet08bllgs0f-1
------------------------------------------------------------
revno: 438.1.1.1.102.1.1
revision-id: mss at mawhrin.net-20070716200940-xb6ux2ct3hovghc4
parent: jelmer at samba.org-20070716151316-gmsmgmly95yu4y5p
committer: Mikhail Sobolev <mss at mawhrin.net>
branch nick: bzr-svn.dev
timestamp: Mon 2007-07-16 23:09:40 +0300
message:
a minor cosmetic change for svn-cache/README: put the link to the actual wiki page
modified:
cache.py cache.py-20070520185908-qbtlcet08bllgs0f-1
------------------------------------------------------------
revno: 438.1.1.1.109
revision-id: jelmer at samba.org-20070717154512-b4dktwqr6gxvex2s
parent: jelmer at samba.org-20070717144857-vo4kgn5cleh2zpu9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2007-07-17 17:45:12 +0200
message:
Some minor fixes, update TODO.
modified:
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.108
revision-id: jelmer at samba.org-20070717144857-vo4kgn5cleh2zpu9
parent: jelmer at samba.org-20070717142317-x24jlddrdcxyl3ci
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2007-07-17 16:48:57 +0200
message:
Avoid filling the cache database with useless entries.
modified:
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
------------------------------------------------------------
revno: 438.1.1.1.107
revision-id: jelmer at samba.org-20070717142317-x24jlddrdcxyl3ci
parent: jelmer at samba.org-20070717131201-lpgui0fat5n8iax3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2007-07-17 16:23:17 +0200
message:
Fix tests, bunch of performance improvements.
modified:
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 438.1.1.1.106
revision-id: jelmer at samba.org-20070717131201-lpgui0fat5n8iax3
parent: jelmer at samba.org-20070716233330-b53bk7g0g4se3pp0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2007-07-17 15:12:01 +0200
message:
Only warn when bzr-svn is actually used.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
transport.py transport.py-20060406231150-b3472d06b3a0818d
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.105
revision-id: jelmer at samba.org-20070716233330-b53bk7g0g4se3pp0
parent: jelmer at samba.org-20070716233221-73i8pq15u2xprro3
parent: jelmer at samba.org-20070716233124-7y30kkrr8ds3itbt
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2007-07-17 01:33:30 +0200
message:
Merge support for creating new branches using push.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
format.py format.py-20060406233823-b6fa009fe35dfde7
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.81.1.13
revision-id: jelmer at samba.org-20070716233124-7y30kkrr8ds3itbt
parent: jelmer at samba.org-20070716191427-u7g51xkfdfpbdac3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: newbranch
timestamp: Tue 2007-07-17 01:31:24 +0200
message:
Add -r option, rename svn-push-new-branch to svn-push-new.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
format.py format.py-20060406233823-b6fa009fe35dfde7
------------------------------------------------------------
revno: 438.1.1.1.81.1.12
revision-id: jelmer at samba.org-20070716191427-u7g51xkfdfpbdac3
parent: jelmer at samba.org-20070716185442-jqegcnqqswza05yx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: newbranch
timestamp: Mon 2007-07-16 21:14:27 +0200
message:
Add command for creating new branches using push.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 438.1.1.1.81.1.11
revision-id: jelmer at samba.org-20070716185442-jqegcnqqswza05yx
parent: jelmer at samba.org-20070716181756-r35lx6gs4hjmm2ef
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: newbranch
timestamp: Mon 2007-07-16 20:54:42 +0200
message:
Support pushing new branches.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
------------------------------------------------------------
revno: 438.1.1.1.81.1.10
revision-id: jelmer at samba.org-20070716181756-r35lx6gs4hjmm2ef
parent: jelmer at samba.org-20070716181649-we5pzeuh3eckit3n
parent: jelmer at samba.org-20070716173844-1hkxm79aeo6cdyta
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: newbranch
timestamp: Mon 2007-07-16 20:17:56 +0200
message:
Merge upstream.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.81.1.9
revision-id: jelmer at samba.org-20070716181649-we5pzeuh3eckit3n
parent: jelmer at samba.org-20070716171336-63n7cvb2lr2hxlor
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: newbranch
timestamp: Mon 2007-07-16 20:16:49 +0200
message:
Fill in functions for creating new branches.
modified:
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
format.py format.py-20060406233823-b6fa009fe35dfde7
------------------------------------------------------------
revno: 438.1.1.1.81.1.8
revision-id: jelmer at samba.org-20070716171336-63n7cvb2lr2hxlor
parent: jelmer at samba.org-20070716151913-u7d9x2vfbbxd403k
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: newbranch
timestamp: Mon 2007-07-16 19:13:36 +0200
message:
Support pushing revisions on top of revisions in different branch paths.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
------------------------------------------------------------
revno: 438.1.1.1.81.1.7
revision-id: jelmer at samba.org-20070716151913-u7d9x2vfbbxd403k
parent: jelmer at samba.org-20070716110753-nhkqxtc0wjlf3mzc
parent: jelmer at samba.org-20070716151316-gmsmgmly95yu4y5p
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: newbranch
timestamp: Mon 2007-07-16 17:19:13 +0200
message:
Merge upstream.
modified:
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_transport.py test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.81.1.6
revision-id: jelmer at samba.org-20070716110753-nhkqxtc0wjlf3mzc
parent: jelmer at samba.org-20070716013419-hwitawuawyzymfi7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: newbranch
timestamp: Mon 2007-07-16 13:07:53 +0200
message:
Some work on supporting different branch paths in SvnCommitBuilder.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
------------------------------------------------------------
revno: 438.1.1.1.81.1.5
revision-id: jelmer at samba.org-20070716013419-hwitawuawyzymfi7
parent: jelmer at samba.org-20070716013402-9ng1zrhlu4xptd1a
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: newbranch
timestamp: Mon 2007-07-16 03:34:19 +0200
message:
More work on supporting creating branches.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
format.py format.py-20060406233823-b6fa009fe35dfde7
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
------------------------------------------------------------
revno: 438.1.1.1.81.1.4
revision-id: jelmer at samba.org-20070716013402-9ng1zrhlu4xptd1a
parent: jelmer at samba.org-20070716011319-8xw4a7uq7gnueunk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: newbranch
timestamp: Mon 2007-07-16 03:34:02 +0200
message:
Add some rename tests
modified:
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
------------------------------------------------------------
revno: 438.1.1.1.81.1.3
revision-id: jelmer at samba.org-20070716011319-8xw4a7uq7gnueunk
parent: jelmer at samba.org-20070715224229-adn0vystv3yqrf35
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: newbranch
timestamp: Mon 2007-07-16 03:13:19 +0200
message:
Fix locking bug.
modified:
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.81.1.2
revision-id: jelmer at samba.org-20070715224229-adn0vystv3yqrf35
parent: jelmer at samba.org-20070712083651-u8l1dci17b2t46gy
parent: jelmer at samba.org-20070714122959-gsxaghhdgys8jnsd
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: newbranch
timestamp: Mon 2007-07-16 00:42:29 +0200
message:
Merge upstream.
renamed:
checkout.py => workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
format.py format.py-20060406233823-b6fa009fe35dfde7
repository.py repository.py-20060306123302-1f8c5069b3fe0265
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_branchprops.py test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
tests/test_checkout.py test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
tests/test_config.py test_config.py-20070624193244-itvnst60evjidr4z-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.104
revision-id: jelmer at samba.org-20070716233221-73i8pq15u2xprro3
parent: jelmer at samba.org-20070716173844-1hkxm79aeo6cdyta
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2007-07-17 01:32:21 +0200
message:
Remove extra mutter call.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
------------------------------------------------------------
revno: 438.1.1.1.103
revision-id: jelmer at samba.org-20070716173844-1hkxm79aeo6cdyta
parent: jelmer at samba.org-20070716151316-gmsmgmly95yu4y5p
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2007-07-16 19:38:44 +0200
message:
Add getter for Branch.branch_path.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.102
revision-id: jelmer at samba.org-20070716151316-gmsmgmly95yu4y5p
parent: jelmer at samba.org-20070716140148-2503h8av21cwcwgz
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2007-07-16 17:13:16 +0200
message:
Fix tests.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
tests/test_transport.py test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
------------------------------------------------------------
revno: 438.1.1.1.101
revision-id: jelmer at samba.org-20070716140148-2503h8av21cwcwgz
parent: jelmer at samba.org-20070716135237-pkysoosb3n18joqn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2007-07-16 16:01:48 +0200
message:
Update TODO.
modified:
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 438.1.1.1.100
revision-id: jelmer at samba.org-20070716135237-pkysoosb3n18joqn
parent: jelmer at samba.org-20070716134336-k8sunv08wk52za59
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2007-07-16 15:52:37 +0200
message:
Initial work supporting write locks
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
tests/test_transport.py test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
------------------------------------------------------------
revno: 438.1.1.1.99
revision-id: jelmer at samba.org-20070716134336-k8sunv08wk52za59
parent: jelmer at samba.org-20070714122959-gsxaghhdgys8jnsd
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2007-07-16 15:43:36 +0200
message:
Always use a branching scheme.
modified:
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 438.1.1.1.98
revision-id: jelmer at samba.org-20070714122959-gsxaghhdgys8jnsd
parent: jelmer at samba.org-20070714122831-eqtp601rn3l1rfq2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2007-07-14 15:29:59 +0300
message:
Check for and use safe file ids.
modified:
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_branchprops.py test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
------------------------------------------------------------
revno: 438.1.1.1.97
revision-id: jelmer at samba.org-20070714122831-eqtp601rn3l1rfq2
parent: jelmer at samba.org-20070714122743-yp9mkj8342vf96so
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2007-07-14 15:28:31 +0300
message:
Fix grammar.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 438.1.1.1.96
revision-id: jelmer at samba.org-20070714122743-yp9mkj8342vf96so
parent: jelmer at samba.org-20070713155250-uwk3ndc1o3qafuv4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2007-07-14 15:27:43 +0300
message:
Avoid using deprecated function.
modified:
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
------------------------------------------------------------
revno: 438.1.1.1.95
revision-id: jelmer at samba.org-20070713155250-uwk3ndc1o3qafuv4
parent: jelmer at samba.org-20070713144243-gibzp0yq29b9k97s
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-13 18:52:50 +0300
message:
Warn when used with experimental version of mappings. (#117198), use lazy imports when possible.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 438.1.1.1.94
revision-id: jelmer at samba.org-20070713144243-gibzp0yq29b9k97s
parent: jelmer at samba.org-20070713113725-defdfi26ku3x2ppb
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-13 17:42:43 +0300
message:
Don't warn when using next development version of bzr.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 438.1.1.1.93
revision-id: jelmer at samba.org-20070713113725-defdfi26ku3x2ppb
parent: jelmer at samba.org-20070713103740-lg11uomlspi8kbu1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-13 14:37:25 +0300
message:
Fix some tests, support setting the branching scheme in a file property on the repository root.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
------------------------------------------------------------
revno: 438.1.1.1.92
revision-id: jelmer at samba.org-20070713103740-lg11uomlspi8kbu1
parent: jelmer at samba.org-20070713103218-ujothzh4z6t0ju6k
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-13 13:37:40 +0300
message:
Let config return a BranchingScheme instance rather than just a string.
modified:
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_config.py test_config.py-20070624193244-itvnst60evjidr4z-1
------------------------------------------------------------
revno: 438.1.1.1.91
revision-id: jelmer at samba.org-20070713103218-ujothzh4z6t0ju6k
parent: jelmer at samba.org-20070713102746-i2dygg1cv2ke9eiw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-13 13:32:18 +0300
message:
Add branching scheme property.
modified:
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
------------------------------------------------------------
revno: 438.1.1.1.90
revision-id: jelmer at samba.org-20070713102746-i2dygg1cv2ke9eiw
parent: jelmer at samba.org-20070713101734-yvgxs558lh7lcvu2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-13 13:27:46 +0300
message:
Support parsing list scheme texts.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
------------------------------------------------------------
revno: 438.1.1.1.89
revision-id: jelmer at samba.org-20070713101734-yvgxs558lh7lcvu2
parent: jelmer at samba.org-20070713101121-mor3bvltp2pyjheo
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-13 13:17:34 +0300
message:
Add docstring, no longer default to TrunkBranchingScheme() but to the scheme specified in ~/.bazaar/subversion.conf.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
scheme.py scheme.py-20060516195850-95181aae6b272f9e
------------------------------------------------------------
revno: 438.1.1.1.88
revision-id: jelmer at samba.org-20070713101121-mor3bvltp2pyjheo
parent: jelmer at samba.org-20070713094309-y3e5iduu3g3anxqw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-13 13:11:21 +0300
message:
Add __str__ to ListBranchingScheme.
modified:
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
------------------------------------------------------------
revno: 438.1.1.1.87
revision-id: jelmer at samba.org-20070713094309-y3e5iduu3g3anxqw
parent: jelmer at samba.org-20070712130714-yeyc40asj743ygci
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-13 12:43:09 +0300
message:
Use branching scheme stored in ~/.bazaar/subversion.conf.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
format.py format.py-20060406233823-b6fa009fe35dfde7
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
Diff too large for email (3800 lines, the limit is 1000).
More information about the bazaar-commits
mailing list