Rev 425: merge upstream in sftp://people.samba.org/~/bzr/bzr-svn/customrevids/
Jelmer Vernooij
jelmer at samba.org
Sat Apr 14 19:01:11 BST 2007
At sftp://people.samba.org/~/bzr/bzr-svn/customrevids/
------------------------------------------------------------
revno: 425
revision-id: jelmer at samba.org-20070414180015-n29pge396twclo2t
parent: jelmer at samba.org-20070306001157-r1lnuw8wn7b8j8g9
parent: jelmer at samba.org-20070328121602-c6b3z2zc093l02h3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Sat 2007-04-14 20:00:15 +0200
message:
merge upstream
added:
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-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
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
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
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
mapping.txt mapping.txt-20060625151311-9ghaqrm71ajq593n-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
scheme.py scheme.py-20060516195850-95181aae6b272f9e
setup.py setup.py-20060502115218-86950492da22353f
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_branchprops.py test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
tests/test_checkout.py test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
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_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-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
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: 421.1.22
merged: jelmer at samba.org-20070328121602-c6b3z2zc093l02h3
parent: aaron.bentley at utoronto.ca-20070328044959-oait3c16t9y716r8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-03-28 14:16:02 +0200
message:
Use short name.
------------------------------------------------------------
revno: 421.1.21
merged: aaron.bentley at utoronto.ca-20070328044959-oait3c16t9y716r8
parent: aaron.bentley at utoronto.ca-20070328040014-pcojau6cwlnyhm36
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: svn
timestamp: Wed 2007-03-28 00:49:59 -0400
message:
Don't use super because BzrError isn't always a new-style class
------------------------------------------------------------
revno: 421.1.20
merged: aaron.bentley at utoronto.ca-20070328040014-pcojau6cwlnyhm36
parent: aaron.bentley at utoronto.ca-20070328034659-ob4po9wj0tm3nz9m
parent: jelmer at samba.org-20070325195045-uqnuxhs254o2lbv3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: svn
timestamp: Wed 2007-03-28 00:00:14 -0400
message:
Merge changes from mainline
------------------------------------------------------------
revno: 421.1.18.1.4
merged: jelmer at samba.org-20070325195045-uqnuxhs254o2lbv3
parent: jelmer at samba.org-20070325184140-tjuwjts3rly7uypl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2007-03-25 21:50:45 +0200
message:
Remove some unused imports.
------------------------------------------------------------
revno: 421.1.18.1.3
merged: jelmer at samba.org-20070325184140-tjuwjts3rly7uypl
parent: jelmer at samba.org-20070325142008-s4xgn0ksym677933
parent: jelmer at samba.org-20070325151508-eliztm1ms969fjk8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2007-03-25 20:41:40 +0200
message:
Merge some formatting fixes, add extra tests.
------------------------------------------------------------
revno: 402.1.38
merged: jelmer at samba.org-20070325151508-eliztm1ms969fjk8
parent: jelmer at samba.org-20070325144144-axorlmksch0g02ps
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sun 2007-03-25 17:15:08 +0200
message:
Add two very trivial blackbox tests.
------------------------------------------------------------
revno: 402.1.37
merged: jelmer at samba.org-20070325144144-axorlmksch0g02ps
parent: jelmer at samba.org-20070324154013-9slv88wjxilfigto
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sun 2007-03-25 16:41:44 +0200
message:
More formatting fixes.
------------------------------------------------------------
revno: 421.1.18.1.2
merged: jelmer at samba.org-20070325142008-s4xgn0ksym677933
parent: jelmer at samba.org-20070323135406-xk28fwaqkj8iymvs
parent: jelmer at samba.org-20070324154013-9slv88wjxilfigto
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2007-03-25 16:20:08 +0200
message:
Merge formatting fixes.
------------------------------------------------------------
revno: 402.1.36
merged: jelmer at samba.org-20070324154013-9slv88wjxilfigto
parent: jelmer at samba.org-20070321131427-3y69fpq97umynbk0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sat 2007-03-24 16:40:13 +0100
message:
General cleanups: remove unused imports, fix line lengths, unused parameters.
------------------------------------------------------------
revno: 402.1.35
merged: jelmer at samba.org-20070321131427-3y69fpq97umynbk0
parent: jelmer at samba.org-20070319132710-iqa4xvx2die96f26
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Wed 2007-03-21 14:14:27 +0100
message:
Bazaar-NG -> Bazaar.
------------------------------------------------------------
revno: 402.1.34
merged: jelmer at samba.org-20070319132710-iqa4xvx2die96f26
parent: jelmer at samba.org-20070319023001-rc2qdo3u0s2bcbvk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Mon 2007-03-19 14:27:10 +0100
message:
Only warn about unknown svn: or bzr: properties, not just any random property.
------------------------------------------------------------
revno: 421.1.18.1.1
merged: jelmer at samba.org-20070323135406-xk28fwaqkj8iymvs
parent: jelmer at samba.org-20070319150900-bcmzs21lub8zihqa
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Fri 2007-03-23 14:54:06 +0100
message:
Bazaar-NG -> Bazaar, update version
------------------------------------------------------------
revno: 421.1.19
merged: aaron.bentley at utoronto.ca-20070328034659-ob4po9wj0tm3nz9m
parent: jelmer at samba.org-20070319150900-bcmzs21lub8zihqa
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: svn
timestamp: Tue 2007-03-27 23:46:59 -0400
message:
Skip tests that require SVN checkout support if unavailable
------------------------------------------------------------
revno: 421.1.18
merged: jelmer at samba.org-20070319150900-bcmzs21lub8zihqa
parent: jelmer at samba.org-20070319112336-stvy6ag2g60xhxva
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-03-19 16:09:00 +0100
message:
Fix incorrect merge.
------------------------------------------------------------
revno: 421.1.17
merged: jelmer at samba.org-20070319112336-stvy6ag2g60xhxva
parent: jelmer at samba.org-20070317214040-o4vewd607anbvfme
parent: jelmer at samba.org-20070319023001-rc2qdo3u0s2bcbvk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-03-19 12:23:36 +0100
message:
Merge two trivial fixes from the 0.3 branch.
------------------------------------------------------------
revno: 402.1.33
merged: jelmer at samba.org-20070319023001-rc2qdo3u0s2bcbvk
parent: jelmer at samba.org-20070319013749-bkub1tns29ynk3zu
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Mon 2007-03-19 03:30:01 +0100
message:
Mark as compatible with 0.16.
------------------------------------------------------------
revno: 402.1.32
merged: jelmer at samba.org-20070319013749-bkub1tns29ynk3zu
parent: jelmer at samba.org-20070319010520-78ofoyhu3eay30pv
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Mon 2007-03-19 02:37:49 +0100
message:
Fix typo.
------------------------------------------------------------
revno: 402.1.31
merged: jelmer at samba.org-20070319010520-78ofoyhu3eay30pv
parent: jelmer at samba.org-20070315160951-gv05hnso079m6gu1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Mon 2007-03-19 02:05:20 +0100
message:
Allow overriding of ui_factory by other plugins (in particular, bzr-gtk).
------------------------------------------------------------
revno: 421.1.16
merged: jelmer at samba.org-20070317214040-o4vewd607anbvfme
parent: jelmer at samba.org-20070316223029-bmf3g7bbh3xgzgrm
parent: aaron.bentley at utoronto.ca-20070317212543-nhu7lx0cmlygkm17
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2007-03-17 22:40:40 +0100
message:
Merge patch from Aaron to prevent lots of warnings about out-of-date
Subversion bindings.
------------------------------------------------------------
revno: 421.1.15.1.1
merged: aaron.bentley at utoronto.ca-20070317212543-nhu7lx0cmlygkm17
parent: jelmer at samba.org-20070316223029-bmf3g7bbh3xgzgrm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: svn
timestamp: Sat 2007-03-17 17:25:43 -0400
message:
Avoid old subversion warning, except when opening checkouts. Error instead.
------------------------------------------------------------
revno: 421.1.15
merged: jelmer at samba.org-20070316223029-bmf3g7bbh3xgzgrm
parent: jelmer at samba.org-20070315191021-cdt3v2b4hawocemy
parent: jelmer at samba.org-20070316222524-8ftljpdlklsu4vre
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Fri 2007-03-16 23:30:29 +0100
message:
Merge support for unique root ids.
------------------------------------------------------------
revno: 236.1.39
merged: jelmer at samba.org-20070316222524-8ftljpdlklsu4vre
parent: jelmer at samba.org-20070316123851-mx9t5xdria4vpng6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Fri 2007-03-16 23:25:24 +0100
message:
Fix remaining tests.
------------------------------------------------------------
revno: 236.1.38
merged: jelmer at samba.org-20070316123851-mx9t5xdria4vpng6
parent: jelmer at samba.org-20070316120902-otcjexd81jwavu9g
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Fri 2007-03-16 13:38:51 +0100
message:
Fix all but two tests.
------------------------------------------------------------
revno: 236.1.37
merged: jelmer at samba.org-20070316120902-otcjexd81jwavu9g
parent: jelmer at samba.org-20070316002516-bixr1j3tebcjlcut
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Fri 2007-03-16 13:09:02 +0100
message:
Fix some more tests.
------------------------------------------------------------
revno: 236.1.36
merged: jelmer at samba.org-20070316002516-bixr1j3tebcjlcut
parent: jelmer at samba.org-20070315191730-sp0ys1rb80x2xyh0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Fri 2007-03-16 01:25:16 +0100
message:
Map revision 0 in Subversion to a custom Bazaar revision rather than NULL_REVISION. This is required as
this is the revision that introduces the tree root.
------------------------------------------------------------
revno: 236.1.35
merged: jelmer at samba.org-20070315191730-sp0ys1rb80x2xyh0
parent: jelmer at samba.org-20070315191637-cq9i4gv0ek5h3t0w
parent: jelmer at samba.org-20070315191021-cdt3v2b4hawocemy
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Thu 2007-03-15 20:17:30 +0100
message:
Merge dev fixes.
------------------------------------------------------------
revno: 236.1.34
merged: jelmer at samba.org-20070315191637-cq9i4gv0ek5h3t0w
parent: jelmer at samba.org-20070315170940-qk2d50iho0q425wo
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Thu 2007-03-15 20:16:37 +0100
message:
Fix some tests, simplify code
------------------------------------------------------------
revno: 236.1.33
merged: jelmer at samba.org-20070315170940-qk2d50iho0q425wo
parent: jelmer at samba.org-20070315164004-f1du1t8vl0su7d6u
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Thu 2007-03-15 18:09:40 +0100
message:
Reduce diff with main
------------------------------------------------------------
revno: 236.1.32
merged: jelmer at samba.org-20070315164004-f1du1t8vl0su7d6u
parent: jelmer at samba.org-20070201141105-7v9zsg97gx0wi2sp
parent: jelmer at samba.org-20070315163013-v1yhb9vkikfuhmtj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Thu 2007-03-15 17:40:04 +0100
message:
Merge dev tree.
------------------------------------------------------------
revno: 236.1.31
merged: jelmer at samba.org-20070201141105-7v9zsg97gx0wi2sp
parent: jelmer at samba.org-20070201140904-wbok37h2amkxi590
parent: jelmer at samba.org-20070201103709-z4xm1j5cwaezzxt0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Thu 2007-02-01 15:11:05 +0100
message:
merge some more upstream changes.
------------------------------------------------------------
revno: 236.1.30
merged: 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.
------------------------------------------------------------
revno: 236.1.29
merged: jelmer at samba.org-20070106232357-48ky0nd2e4aszen4
parent: jelmer at samba.org-20070101175406-z596p07otvo3c8jh
parent: jelmer at samba.org-20070106231146-r09j2k60av8uz1jf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Sun 2007-01-07 00:23:57 +0100
message:
Merge upstream
------------------------------------------------------------
revno: 236.1.28
merged: jelmer at samba.org-20070101175406-z596p07otvo3c8jh
parent: jelmer at samba.org-20061229164052-l6hr3ie3je9ae1zc
parent: jelmer at samba.org-20070101173622-q1h4vkjd9cuevxzd
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Mon 2007-01-01 18:54:06 +0100
message:
Merge upstream.
------------------------------------------------------------
revno: 236.1.27
merged: jelmer at samba.org-20061229164052-l6hr3ie3je9ae1zc
parent: jelmer at samba.org-20061228022606-pl02194x4z5n0zx3
parent: jelmer at samba.org-20061229051751-j93sydbdguw15i25
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Fri 2006-12-29 17:40:52 +0100
message:
Merge upstream fixes.
------------------------------------------------------------
revno: 236.1.26
merged: jelmer at samba.org-20061228022606-pl02194x4z5n0zx3
parent: jelmer at samba.org-20061228021810-6k8pvr2djgzj1xmy
parent: jelmer at samba.org-20061227180657-d11m7tlyad4d4bpa
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Thu 2006-12-28 03:26:06 +0100
message:
Merge from upstream.
------------------------------------------------------------
revno: 236.1.25
merged: jelmer at samba.org-20061228021810-6k8pvr2djgzj1xmy
parent: jelmer at samba.org-20061224005734-9vht3uphksifcyi8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Thu 2006-12-28 03:18:10 +0100
message:
Remove verbose mutter.
------------------------------------------------------------
revno: 236.1.24
merged: jelmer at samba.org-20061224005734-9vht3uphksifcyi8
parent: jelmer at samba.org-20061224004805-beb39pbo1gts79c6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Sun 2006-12-24 01:57:34 +0100
message:
Add tests demonstrating problems with demoting/promoting branches in Subversion (#67010).
------------------------------------------------------------
revno: 236.1.23
merged: jelmer at samba.org-20061224004805-beb39pbo1gts79c6
parent: jelmer at samba.org-20061224003509-g7nn4aslhzz52fni
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Sun 2006-12-24 01:48:05 +0100
message:
Support file id renames. This fixes all tests but one.
------------------------------------------------------------
revno: 236.1.22
merged: jelmer at samba.org-20061224003509-g7nn4aslhzz52fni
parent: jelmer at samba.org-20061223200829-bolzx88r5nugf8rd
parent: jelmer at samba.org-20061224002517-f4670do78x74rd0t
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Sun 2006-12-24 01:35:09 +0100
message:
Merge upstream fixes.
------------------------------------------------------------
revno: 236.1.21
merged: jelmer at samba.org-20061223200829-bolzx88r5nugf8rd
parent: jelmer at samba.org-20061223184826-gaalaufxq56vd32t
parent: jelmer at samba.org-20061223195416-m9u1u422uv0s843x
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Sat 2006-12-23 21:08:29 +0100
message:
Merge upstream fixes.
------------------------------------------------------------
revno: 236.1.20
merged: jelmer at samba.org-20061223184826-gaalaufxq56vd32t
parent: jelmer at samba.org-20061223165812-gauwlfwq5bg3yxu0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Sat 2006-12-23 19:48:26 +0100
message:
Add revision_fileid_renames() function for looking up file id rename maps.
------------------------------------------------------------
revno: 236.1.19
merged: jelmer at samba.org-20061223165812-gauwlfwq5bg3yxu0
parent: jelmer at samba.org-20061223165335-v7pu91kwhgpnyxfr
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Sat 2006-12-23 17:58:12 +0100
message:
Add support for id maps to the file id generating functions.
------------------------------------------------------------
revno: 236.1.18
merged: jelmer at samba.org-20061223165335-v7pu91kwhgpnyxfr
parent: jelmer at samba.org-20061222040558-ymmx5xvakirdwpev
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Sat 2006-12-23 17:53:35 +0100
message:
Ignore tags files.
------------------------------------------------------------
revno: 236.1.17
merged: jelmer at samba.org-20061222040558-ymmx5xvakirdwpev
parent: jelmer at samba.org-20061222003357-8rhdh7lqtuxw9pwk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Fri 2006-12-22 05:05:58 +0100
message:
Fix tests that check storing file id maps. Passes now with Aarons'
by-reference-nested-tree branch.
------------------------------------------------------------
revno: 236.1.16
merged: jelmer at samba.org-20061222003357-8rhdh7lqtuxw9pwk
parent: jelmer at samba.org-20061221202922-dj76rpah7xwzcvj0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Fri 2006-12-22 01:33:57 +0100
message:
Start storing file id mappings.
------------------------------------------------------------
revno: 236.1.15
merged: jelmer at samba.org-20061221202922-dj76rpah7xwzcvj0
parent: jelmer at samba.org-20061220220131-ygbzo09knuxminx0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Thu 2006-12-21 21:29:22 +0100
message:
Add notes about file id mappings.
------------------------------------------------------------
revno: 236.1.14
merged: jelmer at samba.org-20061220220131-ygbzo09knuxminx0
parent: jelmer at samba.org-20061220215935-4iw53e2cixuh27fn
parent: jelmer at samba.org-20061220214217-0fe090fhjzdrqdew
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Wed 2006-12-20 23:01:31 +0100
message:
Merge sqlite fixes from main branch.
------------------------------------------------------------
revno: 236.1.13
merged: jelmer at samba.org-20061220215935-4iw53e2cixuh27fn
parent: jelmer at samba.org-20061220141914-6au3ze3wf5ff3d76
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Wed 2006-12-20 22:59:35 +0100
message:
Make testsuite pass with unique root ids.
------------------------------------------------------------
revno: 236.1.12
merged: jelmer at samba.org-20061220141914-6au3ze3wf5ff3d76
parent: jelmer at samba.org-20061220135248-hbq6yve4a830mj3b
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Wed 2006-12-20 15:19:14 +0100
message:
Make root ids less special (use "regular" file ids, so
by-value nested branches are possible).
------------------------------------------------------------
revno: 236.1.11
merged: jelmer at samba.org-20061220135248-hbq6yve4a830mj3b
parent: jelmer at samba.org-20061220114423-whtiohd8b95ysmxm
parent: jelmer at samba.org-20061220135017-j2w5gw7s01ve3m80
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Wed 2006-12-20 14:52:48 +0100
message:
merge fix
------------------------------------------------------------
revno: 236.1.10
merged: jelmer at samba.org-20061220114423-whtiohd8b95ysmxm
parent: jelmer at samba.org-20061220111612-08ry01xlmpv7fsq8
parent: jelmer at samba.org-20061220114336-ypkrkimgqoxick9d
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Wed 2006-12-20 12:44:23 +0100
message:
Merge fix.
------------------------------------------------------------
revno: 236.1.9
merged: jelmer at samba.org-20061220111612-08ry01xlmpv7fsq8
parent: jelmer at samba.org-20061215205711-drmzbf2t5wtd19ka
parent: jelmer at samba.org-20061219235015-oq6unv0op3tzjofp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Wed 2006-12-20 12:16:12 +0100
message:
Merge trunk changes.
------------------------------------------------------------
revno: 236.1.8
merged: jelmer at samba.org-20061215205711-drmzbf2t5wtd19ka
parent: jelmer at samba.org-20061215203127-on3a7hvoq3x0anid
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Fri 2006-12-15 21:57:11 +0100
message:
Require bzr 0.14 - 0.13 doesn't contain add_path() fixes.
------------------------------------------------------------
revno: 236.1.7
merged: jelmer at samba.org-20061215203127-on3a7hvoq3x0anid
parent: jelmer at samba.org-20061212222806-ho5n55gwssa7w0t8
parent: jelmer at samba.org-20061215194410-w1nm95osezkdk602
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Fri 2006-12-15 21:31:27 +0100
message:
Merge from trunk.
------------------------------------------------------------
revno: 236.1.6
merged: jelmer at samba.org-20061212222806-ho5n55gwssa7w0t8
parent: jelmer at samba.org-20061212221824-o990uu7bunvdabxs
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Tue 2006-12-12 23:28:06 +0100
message:
Fix fileid test.
------------------------------------------------------------
revno: 236.1.5
merged: jelmer at samba.org-20061212221824-o990uu7bunvdabxs
parent: jelmer at samba.org-20061212200018-qqbnzdre65bzp4lc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Tue 2006-12-12 23:18:24 +0100
message:
More work on supporting variable ROOT_ID's
------------------------------------------------------------
revno: 236.1.4
merged: jelmer at samba.org-20061212200018-qqbnzdre65bzp4lc
parent: jelmer at samba.org-20061212200008-r08qsbc6wneliyy7
parent: jelmer at samba.org-20061212163430-nckdbzq3idmn956c
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Tue 2006-12-12 21:00:18 +0100
message:
Merge main branch.
------------------------------------------------------------
revno: 236.1.3
merged: jelmer at samba.org-20061212200008-r08qsbc6wneliyy7
parent: jelmer at samba.org-20061212122729-4c4wxjh01ompdwh5
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Tue 2006-12-12 21:00:08 +0100
message:
Fix some more tests.
------------------------------------------------------------
revno: 236.1.2
merged: jelmer at samba.org-20061212122729-4c4wxjh01ompdwh5
parent: jelmer at samba.org-20061212113418-qh4arbd0rabgle3l
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Tue 2006-12-12 13:27:29 +0100
message:
Fix first couple of tests.
------------------------------------------------------------
revno: 236.1.1
merged: jelmer at samba.org-20061212113418-qh4arbd0rabgle3l
parent: jelmer at samba.org-20061207021212-18f2e5oz4hpp3c21
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Tue 2006-12-12 12:34:18 +0100
message:
Remove ROOT_ID.
------------------------------------------------------------
revno: 421.1.14
merged: jelmer at samba.org-20070315191021-cdt3v2b4hawocemy
parent: jelmer at samba.org-20070315163013-v1yhb9vkikfuhmtj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Thu 2007-03-15 20:10:21 +0100
message:
Fix tests.
------------------------------------------------------------
revno: 421.1.13
merged: jelmer at samba.org-20070315163013-v1yhb9vkikfuhmtj
parent: jelmer at samba.org-20070313143505-59evkrfikl4aoa56
parent: jelmer at samba.org-20070315160951-gv05hnso079m6gu1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Thu 2007-03-15 17:30:13 +0100
message:
Merge speed improvements from 0.3 branch.
------------------------------------------------------------
revno: 402.1.30
merged: jelmer at samba.org-20070315160951-gv05hnso079m6gu1
parent: jelmer at samba.org-20070313100558-tfdjo5ar8fzhuoy9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Thu 2007-03-15 17:09:51 +0100
message:
Don't do extra checkout before push. This changes the complexity of push to Subversion from O(tree size+commit size) to O(commit size).
Pushing to Samba is now only a few seconds!
------------------------------------------------------------
revno: 421.1.12
merged: jelmer at samba.org-20070313143505-59evkrfikl4aoa56
parent: jelmer at samba.org-20070313002403-57ghh1n3sqrurjtr
parent: jelmer at samba.org-20070313100558-tfdjo5ar8fzhuoy9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-03-13 15:35:05 +0100
message:
Merge 0.3.2
------------------------------------------------------------
revno: 402.1.29
merged: jelmer at samba.org-20070313100558-tfdjo5ar8fzhuoy9
parent: jelmer at samba.org-20070313094214-nz3rhuhp8spxhrq7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-03-13 11:05:58 +0100
message:
Fill in release date.
------------------------------------------------------------
revno: 402.1.28
merged: jelmer at samba.org-20070313094214-nz3rhuhp8spxhrq7
parent: jelmer at samba.org-20070313094012-82e1acd6v06p91iv
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-03-13 10:42:14 +0100
message:
Update TODO
------------------------------------------------------------
revno: 402.1.27
merged: jelmer at samba.org-20070313094012-82e1acd6v06p91iv
parent: jelmer at samba.org-20070313001750-tjw1x4m48updphg6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-03-13 10:40:12 +0100
message:
Update year
------------------------------------------------------------
revno: 421.1.11
merged: jelmer at samba.org-20070313002403-57ghh1n3sqrurjtr
parent: jelmer at samba.org-20070308184856-mf3b7dh75r0d1dbg
parent: jelmer at samba.org-20070313001750-tjw1x4m48updphg6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-03-13 01:24:03 +0100
message:
Merge from 0.3 branch
------------------------------------------------------------
revno: 402.1.26
merged: jelmer at samba.org-20070313001750-tjw1x4m48updphg6
parent: jelmer at samba.org-20070313001434-ynu3jjm33u1zbu9j
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-03-13 01:17:50 +0100
message:
All of the original svn2bzr code is gone now, remove references to it.
------------------------------------------------------------
revno: 402.1.25
merged: jelmer at samba.org-20070313001434-ynu3jjm33u1zbu9j
parent: jelmer at samba.org-20070312234911-720qkouscnlrdzhx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-03-13 01:14:34 +0100
message:
Disable revert test (won't fix revert before 0.3.2)
------------------------------------------------------------
revno: 402.1.24
merged: jelmer at samba.org-20070312234911-720qkouscnlrdzhx
parent: jelmer at samba.org-20070312231130-3q3rr8sgwwf0ikzg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-03-13 00:49:11 +0100
message:
Add test for pushing to nested branch locations.
------------------------------------------------------------
revno: 402.1.23
merged: jelmer at samba.org-20070312231130-3q3rr8sgwwf0ikzg
parent: jelmer at samba.org-20070312225122-7uh34ah30dqupuov
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Tue 2007-03-13 00:11:30 +0100
message:
Handle unicode characters in filenames (#54736).
------------------------------------------------------------
revno: 402.1.22
merged: jelmer at samba.org-20070312225122-7uh34ah30dqupuov
parent: jelmer at samba.org-20070312222054-r4acr5mlbresckgi
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Mon 2007-03-12 23:51:22 +0100
message:
Add trivial test for PullResult().
Initial work on a fix for #54736.
------------------------------------------------------------
revno: 402.1.21
merged: jelmer at samba.org-20070312222054-r4acr5mlbresckgi
parent: jelmer at samba.org-20070312214831-334mlg82yvrl9395
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Mon 2007-03-12 23:20:54 +0100
message:
Fix {Branch,WorkingTree}.pull() to return PullResult.
------------------------------------------------------------
revno: 402.1.20
merged: jelmer at samba.org-20070312214831-334mlg82yvrl9395
parent: jelmer at samba.org-20070311232925-2nc3xpxxmoftgbyi
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Mon 2007-03-12 22:48:31 +0100
message:
Add delta reporter argument to Branch.pull().
------------------------------------------------------------
revno: 402.1.19
merged: jelmer at samba.org-20070311232925-2nc3xpxxmoftgbyi
parent: jelmer at samba.org-20070311231857-oadyn73j674c3u1f
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Mon 2007-03-12 00:29:25 +0100
message:
Fix push instance of #85551 as well.
------------------------------------------------------------
revno: 402.1.18
merged: jelmer at samba.org-20070311231857-oadyn73j674c3u1f
parent: jelmer at samba.org-20070311225839-b1vmok87wjge8y7x
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Mon 2007-03-12 00:18:57 +0100
message:
handle unicode characters in commit messages. (#85551).
Was already fixed in a jelmer at samba.org-20070311011931-ybkbi14bf2lykzv0.
This commit just adds a test and a news entry.
------------------------------------------------------------
revno: 402.1.17
merged: jelmer at samba.org-20070311225839-b1vmok87wjge8y7x
parent: jelmer at samba.org-20070311015848-s4599kx059ggwd6s
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sun 2007-03-11 23:58:39 +0100
message:
Make LogWalker.find_latest_change() check parent paths too. Fixes #84087.
------------------------------------------------------------
revno: 402.1.16
merged: jelmer at samba.org-20070311015848-s4599kx059ggwd6s
parent: jelmer at samba.org-20070311015822-bnsnpxp4i6fbk56d
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sun 2007-03-11 02:58:48 +0100
message:
Remove tests for lightweight .bzr checkouts of Subversion branches. This doesn't work with
dirstate (and doesn't have to, anyway)
------------------------------------------------------------
revno: 402.1.15
merged: jelmer at samba.org-20070311015822-bnsnpxp4i6fbk56d
parent: jelmer at samba.org-20070311011931-ybkbi14bf2lykzv0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sun 2007-03-11 02:58:22 +0100
message:
Allow WorkingTree.add() arguments to be strings.
------------------------------------------------------------
revno: 402.1.14
merged: jelmer at samba.org-20070311011931-ybkbi14bf2lykzv0
parent: jelmer at samba.org-20070304124653-qonoqatvu19wwn8p
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sun 2007-03-11 02:19:31 +0100
message:
Fix the unicode revid/fileid warnings.
------------------------------------------------------------
revno: 421.1.10
merged: jelmer at samba.org-20070308184856-mf3b7dh75r0d1dbg
parent: jelmer at samba.org-20070304125003-20rzetkgu0l40mxc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Thu 2007-03-08 19:48:56 +0100
message:
Prepare for 0.16
Diff too large for email (4204 lines, the limit is 1000).
More information about the bazaar-commits
mailing list