Rev 1036: Merge 0.4. in file:///data/jelmer/bzr-svn/pyrex/
Jelmer Vernooij
jelmer at samba.org
Fri May 30 03:38:29 BST 2008
At file:///data/jelmer/bzr-svn/pyrex/
------------------------------------------------------------
revno: 1036
revision-id: jelmer at samba.org-20080530023827-acd2nqcjvtmlieav
parent: jelmer at samba.org-20080530023003-3pqhqcmrvu0w6adj
parent: jelmer at samba.org-20080529163036-kxcqdkwoet73vz2w
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Fri 2008-05-30 04:38:27 +0200
message:
Merge 0.4.
added:
tests/test_changes.py test_changes.py-20080529111734-f7fbshmnlgnvue45-1
modified:
AUTHORS AUTHORS-20060508114718-4c90c0062645106d
FAQ faq-20070910195147-p9u38s9wplds2d4o-1
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
NEWS news-20061231030336-h9fhq245ie0de8bs-1
README README-20051120210643-bd274a2fef9aed6a
__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
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
mapping3/scheme.py scheme.py-20060516195850-95181aae6b272f9e
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_tree.py test_tree.py-20070103204350-pr8nupes7e5sd2wr-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: 950.3.134
revision-id: jelmer at samba.org-20080529163036-kxcqdkwoet73vz2w
parent: jelmer at samba.org-20080529142341-ijeixbn02szz0bbs
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-29 18:30:36 +0200
message:
Avoid passing None to get_parent_map()
modified:
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
------------------------------------------------------------
revno: 950.3.133
revision-id: jelmer at samba.org-20080529142341-ijeixbn02szz0bbs
parent: jelmer at samba.org-20080529125915-8qbuc7h0d2j43hje
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-29 16:23:41 +0200
message:
use new version of rebase which doesn't use full revision graphs.
modified:
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
------------------------------------------------------------
revno: 950.3.132
revision-id: jelmer at samba.org-20080529125915-8qbuc7h0d2j43hje
parent: jelmer at samba.org-20080529122555-oycvtkax3kvhdlsk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-29 14:59:15 +0200
message:
Remove Repository.revision_parents().
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
------------------------------------------------------------
revno: 950.3.131
revision-id: jelmer at samba.org-20080529122555-oycvtkax3kvhdlsk
parent: jelmer at samba.org-20080529120551-t7wcs8laay3dj56q
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-29 14:25:55 +0200
message:
Raise appropriate errors when using annotate.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
tests/test_tree.py test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
------------------------------------------------------------
revno: 950.3.130
revision-id: jelmer at samba.org-20080529120551-t7wcs8laay3dj56q
parent: jelmer at samba.org-20080529114602-p1odyv15pukzqw1e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-29 14:05:51 +0200
message:
Remove get_revision_graph() as upstream no longer has it either.
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
------------------------------------------------------------
revno: 950.3.129
revision-id: jelmer at samba.org-20080529114602-p1odyv15pukzqw1e
parent: jelmer at samba.org-20080529112823-0kgepzlobwts7inc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-29 13:46:02 +0200
message:
Use selftest --starting-with.
modified:
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
------------------------------------------------------------
revno: 950.3.128
revision-id: jelmer at samba.org-20080529112823-0kgepzlobwts7inc
parent: jelmer at samba.org-20080529112423-7h7ff14tmjasplaq
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-29 13:28:23 +0200
message:
Fix import.
modified:
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 950.3.127
revision-id: jelmer at samba.org-20080529112423-7h7ff14tmjasplaq
parent: jelmer at samba.org-20080529112240-pl6xpxs1apzz4x5n
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-29 13:24:23 +0200
message:
Extend assertion error message.
modified:
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
------------------------------------------------------------
revno: 950.3.126
revision-id: jelmer at samba.org-20080529112240-pl6xpxs1apzz4x5n
parent: jelmer at samba.org-20080529111808-sc6xkqszxhp9ix52
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-29 13:22:40 +0200
message:
Fix compatibility with bzr 1.6.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
------------------------------------------------------------
revno: 950.3.125
revision-id: jelmer at samba.org-20080529111808-sc6xkqszxhp9ix52
parent: jelmer at samba.org-20080529000938-8cn0djnvzay0o67d
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-29 13:18:08 +0200
message:
Add tests for changes module.
added:
tests/test_changes.py test_changes.py-20080529111734-f7fbshmnlgnvue45-1
modified:
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
------------------------------------------------------------
revno: 950.3.124
revision-id: jelmer at samba.org-20080529000938-8cn0djnvzay0o67d
parent: jelmer at samba.org-20080528232739-87ekqkg6xv72ey9h
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-29 02:09:38 +0200
message:
Fix case insensitive handling of paths in CachingLogWalker.find_latest_change().
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
------------------------------------------------------------
revno: 950.3.123
revision-id: jelmer at samba.org-20080528232739-87ekqkg6xv72ey9h
parent: jelmer at samba.org-20080524154205-urys5tpldo0bcz02
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-29 01:27:39 +0200
message:
Fix compatibility with newer versions of Subversion.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
------------------------------------------------------------
revno: 950.3.122
revision-id: jelmer at samba.org-20080524154205-urys5tpldo0bcz02
parent: jelmer at samba.org-20080524141235-73jy4roghismuu1z
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-05-24 17:42:05 +0200
message:
Add simple blackbox test for 'bzr branch'
modified:
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
------------------------------------------------------------
revno: 950.3.121
revision-id: jelmer at samba.org-20080524141235-73jy4roghismuu1z
parent: jelmer at samba.org-20080523113212-blhfdd5u5nbjq6ee
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-05-24 16:12:35 +0200
message:
Fix accidently removed argument.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
------------------------------------------------------------
revno: 950.3.120
revision-id: jelmer at samba.org-20080523113212-blhfdd5u5nbjq6ee
parent: jelmer at samba.org-20080521194016-ijaq8upw7jq4ptll
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-05-23 13:32:12 +0200
message:
Fix import of rebase check function.
modified:
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
------------------------------------------------------------
revno: 950.3.119
revision-id: jelmer at samba.org-20080521194016-ijaq8upw7jq4ptll
parent: jelmer at samba.org-20080518152416-927461jrkz37ln8j
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2008-05-21 21:40:16 +0200
message:
Fix dealing with strange remove during replace operation.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
------------------------------------------------------------
revno: 950.3.118
revision-id: jelmer at samba.org-20080518152416-927461jrkz37ln8j
parent: jelmer at samba.org-20080518144548-qbrs13zqud2epllq
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-05-18 17:24:16 +0200
message:
Improve formatting.
modified:
FAQ faq-20070910195147-p9u38s9wplds2d4o-1
------------------------------------------------------------
revno: 950.3.117
revision-id: jelmer at samba.org-20080518144548-qbrs13zqud2epllq
parent: jelmer at samba.org-20080518143426-vre0xj5w05x8z2u9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-05-18 16:45:48 +0200
message:
use cheaper as_revision_id
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 950.3.116
revision-id: jelmer at samba.org-20080518143426-vre0xj5w05x8z2u9
parent: jelmer at samba.org-20080518143313-ygxwi1rmj5jczw2g
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: dpush
timestamp: Sun 2008-05-18 16:34:26 +0200
message:
Move rebase checking to __init__.py.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
------------------------------------------------------------
revno: 950.3.115
revision-id: jelmer at samba.org-20080518143313-ygxwi1rmj5jczw2g
parent: jelmer at samba.org-20080518141334-ejdhcpismnz397wk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: dpush
timestamp: Sun 2008-05-18 16:33:13 +0200
message:
Allow checking for other rebase versions.
modified:
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
------------------------------------------------------------
revno: 950.3.114
revision-id: jelmer at samba.org-20080518141334-ejdhcpismnz397wk
parent: jelmer at samba.org-20080518123157-t6mhwqft1bgted3m
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-05-18 16:13:34 +0200
message:
Wording improvement in FAQ.
modified:
FAQ faq-20070910195147-p9u38s9wplds2d4o-1
------------------------------------------------------------
revno: 950.3.113
revision-id: jelmer at samba.org-20080518123157-t6mhwqft1bgted3m
parent: jelmer at samba.org-20080515200318-przx9hsplqf1l1v1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-05-18 14:31:57 +0200
message:
Fix some typos.
modified:
README README-20051120210643-bd274a2fef9aed6a
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
------------------------------------------------------------
revno: 950.3.112
revision-id: jelmer at samba.org-20080515200318-przx9hsplqf1l1v1
parent: jelmer at samba.org-20080515200048-jsp5q2qep5appquc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-15 22:03:18 +0200
message:
Leave reparenting to transport code logic.
modified:
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
------------------------------------------------------------
revno: 950.3.111
revision-id: jelmer at samba.org-20080515200048-jsp5q2qep5appquc
parent: jelmer at samba.org-20080515190814-iaxhlqxa9dc2p3i5
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-15 22:00:48 +0200
message:
Fix import to avoid problems with bzr-builddeb.
modified:
mapping3/scheme.py scheme.py-20060516195850-95181aae6b272f9e
------------------------------------------------------------
revno: 950.3.110
revision-id: jelmer at samba.org-20080515190814-iaxhlqxa9dc2p3i5
parent: jelmer at samba.org-20080515025816-x82erjirjxsalxxo
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-15 21:08:14 +0200
message:
Typo in Russel's name.
modified:
AUTHORS AUTHORS-20060508114718-4c90c0062645106d
------------------------------------------------------------
revno: 950.3.109
revision-id: jelmer at samba.org-20080515025816-x82erjirjxsalxxo
parent: jelmer at samba.org-20080515022613-iya73fmxk9m0y0vs
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-15 04:58:16 +0200
message:
Cope with kind changes better.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
------------------------------------------------------------
revno: 950.3.108
revision-id: jelmer at samba.org-20080515022613-iya73fmxk9m0y0vs
parent: jelmer at samba.org-20080515012334-zu30n7oblltur8ke
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-15 04:26:13 +0200
message:
Fix assertion.
modified:
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
------------------------------------------------------------
revno: 950.3.107
revision-id: jelmer at samba.org-20080515012334-zu30n7oblltur8ke
parent: jelmer at samba.org-20080514193048-0lh7mc9c9x6494o1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-15 03:23:34 +0200
message:
Fix setting of branching scheme.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
Diff too large for email (1068 lines, the limit is 1000).
More information about the bazaar-commits
mailing list