Rev 436: Merge support for unique root ids. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
Jelmer Vernooij
jelmer at samba.org
Mon Mar 19 15:55:41 GMT 2007
At http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
------------------------------------------------------------
revno: 436
revision-id: 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.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
checkout.py workingtree.py-20060306120941-b083cb0fdd4a69de
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
mapping.txt mapping.txt-20060625151311-9ghaqrm71ajq593n-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_upgrade.py test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
------------------------------------------------------------
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.
Diff too large for email (1018 lines, the limit is 1000).
More information about the bazaar-commits
mailing list