Rev 321: Merge 0.4.15. in http://bzr.debian.org/pkg-bazaar/bzr-svn/experimental
Jelmer Vernooij
jelmer at samba.org
Mon Nov 10 01:32:20 GMT 2008
At http://bzr.debian.org/pkg-bazaar/bzr-svn/experimental
------------------------------------------------------------
revno: 321
revision-id: jelmer at samba.org-20081110013216-jfwygakf3hnbti03
parent: jelmer at samba.org-20081103135700-x7l91pp4otft5vyi
parent: jelmer at samba.org-20081110011000-y0ojz2os3eatv8ri
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Mon 2008-11-10 02:32:16 +0100
message:
Merge 0.4.15.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
client.c client.pyx-20080313235339-wbyjbw2namuiql8f-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
debian/changelog changelog-20061009030331-beff4307o0ccq70i-3
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
setup.py setup.py-20060502115218-86950492da22353f
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_branchprops.py test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_repository.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
versionedfiles.py versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
------------------------------------------------------------
revno: 220.76.23
revision-id: jelmer at samba.org-20081110011000-y0ojz2os3eatv8ri
parent: jelmer at samba.org-20081110000730-43y0x4za1st25p7n
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-11-10 02:10:00 +0100
message:
release 0.4.15.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
------------------------------------------------------------
revno: 220.76.22
revision-id: jelmer at samba.org-20081110000730-43y0x4za1st25p7n
parent: jelmer at samba.org-20081109213654-h0bkcj0a4e3qujxz
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-11-10 01:07:30 +0100
message:
Add test for #274689 which was apparently already fixed.
modified:
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
------------------------------------------------------------
revno: 220.76.21
revision-id: jelmer at samba.org-20081109213654-h0bkcj0a4e3qujxz
parent: jelmer at samba.org-20081109205321-t1cm6u5cjdf1lsq6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-11-09 22:36:54 +0100
message:
Don't take over when pulling from WebDAV source (without Subversion)
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
------------------------------------------------------------
revno: 220.76.20
revision-id: jelmer at samba.org-20081109205321-t1cm6u5cjdf1lsq6
parent: jelmer at samba.org-20081109200134-l6faemxkza9n5t35
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-11-09 21:53:21 +0100
message:
Make assert a bit more verbose.
modified:
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
------------------------------------------------------------
revno: 220.76.19
revision-id: jelmer at samba.org-20081109200134-l6faemxkza9n5t35
parent: jelmer at samba.org-20081109195807-mducpprmvql5gbju
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-11-09 21:01:34 +0100
message:
Fix erroneous call to __init__.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
------------------------------------------------------------
revno: 220.76.18
revision-id: jelmer at samba.org-20081109195807-mducpprmvql5gbju
parent: jelmer at samba.org-20081109195639-ei0pa55kxkfdo1h6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-11-09 20:58:07 +0100
message:
Use find_new_lines when finding revision ids.
modified:
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
------------------------------------------------------------
revno: 220.76.17
revision-id: jelmer at samba.org-20081109195639-ei0pa55kxkfdo1h6
parent: jelmer at samba.org-20081109183314-hotooz35p7sapkej
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-11-09 20:56:39 +0100
message:
Add some tests for find_new_lines.
modified:
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
------------------------------------------------------------
revno: 220.76.16
revision-id: jelmer at samba.org-20081109183314-hotooz35p7sapkej
parent: jelmer at samba.org-20081109164122-e48e1e7ka277ef8l
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-11-09 19:33:14 +0100
message:
Cope with file properties being modified by other parties than bzr-svn.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
------------------------------------------------------------
revno: 220.76.15
revision-id: jelmer at samba.org-20081109164122-e48e1e7ka277ef8l
parent: jelmer at samba.org-20081109050606-uw85yrmemewf60ve
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-11-09 17:41:22 +0100
message:
Fix remaining tests.
modified:
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
------------------------------------------------------------
revno: 220.76.14
revision-id: jelmer at samba.org-20081109050606-uw85yrmemewf60ve
parent: jelmer at samba.org-20081109044042-fsf9qv3j1zlpiqn0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-11-09 06:06:06 +0100
message:
Cope with new changed file properties return format.
modified:
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 220.76.13
revision-id: jelmer at samba.org-20081109044042-fsf9qv3j1zlpiqn0
parent: jelmer at samba.org-20081109043322-jvzof2b0j6a9klmg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-11-09 05:40:42 +0100
message:
Make branchprop code return old property values as well.
modified:
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
tests/test_branchprops.py test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
------------------------------------------------------------
revno: 220.76.12
revision-id: jelmer at samba.org-20081109043322-jvzof2b0j6a9klmg
parent: jelmer at samba.org-20081108211128-azi6ujhluh03qe7w
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-11-09 05:33:22 +0100
message:
Add test case demonstrating bug 295284.
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_repository.py test_repos.py-20060508151940-ddc49a59257ca712
------------------------------------------------------------
revno: 220.76.11
revision-id: jelmer at samba.org-20081108211128-azi6ujhluh03qe7w
parent: jelmer at samba.org-20081108205443-bljnvkxv54uoin8z
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-11-08 22:11:28 +0100
message:
Fix knit corruption because text revisions weren't stored correctly.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
versionedfiles.py versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
------------------------------------------------------------
revno: 220.76.10
revision-id: jelmer at samba.org-20081108205443-bljnvkxv54uoin8z
parent: jelmer at samba.org-20081108200202-kplsv702oazebfu9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-11-08 21:54:43 +0100
message:
Fix more tests.
modified:
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 220.76.9
revision-id: jelmer at samba.org-20081108200202-kplsv702oazebfu9
parent: jelmer at samba.org-20081108181139-rirv83qgy4wyu6nd
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-11-08 21:02:02 +0100
message:
initial work handling knit corruption because of incorrect text parents.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
------------------------------------------------------------
revno: 220.76.8
revision-id: jelmer at samba.org-20081108181139-rirv83qgy4wyu6nd
parent: jelmer at samba.org-20081108180540-1grspvd20lflzj0r
parent: jelmer at samba.org-20081105190148-5wu9jr0p4dwt00q0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-11-08 19:11:39 +0100
message:
Merge upstream.
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 220.77.2
revision-id: jelmer at samba.org-20081105190148-5wu9jr0p4dwt00q0
parent: jelmer at samba.org-20081105185800-mbveowwy4d25s3om
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2008-11-05 20:01:48 +0100
message:
Mention bug #
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
------------------------------------------------------------
revno: 220.77.1
revision-id: jelmer at samba.org-20081105185800-mbveowwy4d25s3om
parent: jelmer at samba.org-20081103141047-yngwlay84xy7xi2n
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2008-11-05 19:58:00 +0100
message:
Fix another bug handling files as tags.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 220.76.7
revision-id: jelmer at samba.org-20081108180540-1grspvd20lflzj0r
parent: jelmer at samba.org-20081108175315-4csugspukf6l6um4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-11-08 19:05:40 +0100
message:
add test for bug #277043
modified:
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
------------------------------------------------------------
revno: 220.76.6
revision-id: jelmer at samba.org-20081108175315-4csugspukf6l6um4
parent: jelmer at samba.org-20081108172032-38r9qqnw3kh4p4iw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-11-08 18:53:15 +0100
message:
Fix parentheses.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
------------------------------------------------------------
revno: 220.76.5
revision-id: jelmer at samba.org-20081108172032-38r9qqnw3kh4p4iw
parent: jelmer at samba.org-20081108141622-47okgpcnc91y9vk0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-11-08 18:20:32 +0100
message:
Sanitize paths in client.
modified:
client.c client.pyx-20080313235339-wbyjbw2namuiql8f-1
------------------------------------------------------------
revno: 220.76.4
revision-id: jelmer at samba.org-20081108141622-47okgpcnc91y9vk0
parent: jelmer at samba.org-20081103141047-yngwlay84xy7xi2n
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-11-08 15:16:22 +0100
message:
Allow copying from files with spaces in their name over http.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
------------------------------------------------------------
revno: 220.76.3
revision-id: jelmer at samba.org-20081103141047-yngwlay84xy7xi2n
parent: jelmer at samba.org-20081103133948-azf0gfew5q3ievjw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-11-03 15:10:47 +0100
message:
Start on 0.4.15
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
setup.py setup.py-20060502115218-86950492da22353f
------------------------------------------------------------
revno: 220.76.2
revision-id: jelmer at samba.org-20081103133948-azf0gfew5q3ievjw
parent: jelmer at samba.org-20081030205059-uae7dcrznb89u2sv
parent: jelmer at samba.org-20081103133648-q9b1j02gej298lpe
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-11-03 14:39:48 +0100
message:
Merge upstream.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
delta.py delta.py-20080316001917-xyng7m3jlxvdc4c9-1
editor.h editor.h-20080602191336-frj7az1sdk13o1tw-2
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
ra.c ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
wc.c wc.pyx-20080313142018-10l8l23vha2j9e6b-1
------------------------------------------------------------
revno: 220.76.1
revision-id: jelmer at samba.org-20081030205059-uae7dcrznb89u2sv
parent: jelmer at samba.org-20081010180416-pjcrar4dr033waod
parent: john at arbash-meinel.com-20081030191211-3jxp7vj5lx1makmz
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-10-30 21:50:59 +0100
message:
Merge win32 fixes from John.
modified:
client.c client.pyx-20080313235339-wbyjbw2namuiql8f-1
editor.c editor.c-20080602191336-frj7az1sdk13o1tw-1
Diff too large for email (1077 lines, the limit is 1000).
More information about the bazaar-commits
mailing list