Rev 265: Merge upstream in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
Jelmer Vernooij
jelmer at samba.org
Sat Jan 6 23:25:22 GMT 2007
------------------------------------------------------------
revno: 265
revision-id: 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
added:
tests/test_tree.py test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
tests/test_upgrade.py test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
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
checkout.py workingtree.py-20060306120941-b083cb0fdd4a69de
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
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
scheme.py scheme.py-20060516195850-95181aae6b272f9e
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_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
------------------------------------------------------------
revno: 236.1.11.1.134
merged: jelmer at samba.org-20070106231146-r09j2k60av8uz1jf
parent: jelmer at samba.org-20070106225630-x6bm3q2xu73xllyx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2007-01-07 00:11:46 +0100
message:
Some locking.
------------------------------------------------------------
revno: 236.1.11.1.133
merged: jelmer at samba.org-20070106225630-x6bm3q2xu73xllyx
parent: jelmer at samba.org-20070106215112-2x0vx6ham30ej6bh
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2007-01-06 23:56:30 +0100
message:
Add svn-upgrade command.
------------------------------------------------------------
revno: 236.1.11.1.132
merged: jelmer at samba.org-20070106215112-2x0vx6ham30ej6bh
parent: jelmer at samba.org-20070106212433-roc7i97z1uuna32a
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2007-01-06 22:51:12 +0100
message:
Simple upgrades work now.
------------------------------------------------------------
revno: 236.1.11.1.131
merged: jelmer at samba.org-20070106212433-roc7i97z1uuna32a
parent: jelmer at samba.org-20070106205319-xuizcqarqb4rrv2e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2007-01-06 22:24:33 +0100
message:
Fix test_fetch_all().
------------------------------------------------------------
revno: 236.1.11.1.130
merged: jelmer at samba.org-20070106205319-xuizcqarqb4rrv2e
parent: jelmer at samba.org-20070106193150-ubn5wjhot0mqo9et
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2007-01-06 21:53:19 +0100
message:
Generate revision ids for upgraded revisions correctly and some other random
plumbing.
------------------------------------------------------------
revno: 236.1.11.1.129
merged: jelmer at samba.org-20070106193150-ubn5wjhot0mqo9et
parent: jelmer at samba.org-20070106165818-4mt4qbtnyn6340h0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2007-01-06 20:31:50 +0100
message:
Initial work on an upgrade command that can replace old mapped SVN revisions
with more recent ones.
This is useful, for example, you have a couple of custom bzr revisions on
top of a Subversion branch and need to merge new revisions after upgrading
bzr-svn.
This commit adds a simple utility function that can copy a revision but
changes its parent ids.
-------------- This line and the following will be ignored --------------
added:
tests/test_upgrade.py
upgrade.py
modified:
tests/__init__.py
unknown:
.coverage
__init__.py,cover
_trial_temp
branch.py,cover
branchprops.py,cover
bzr_svn.egg-info
checkout.py,cover
checkouts
commit.py,cover
convert-all.diff
convert.py,cover
coverage.py
coverage.py,cover
errors.py,cover
fetch.py,cover
fileids.py,cover
format.py,cover
idmap
jelmer.diff
logwalker.py,cover
p1.diff
properfix.diff
repository.py,cover
scheme.py,cover
setup.py,cover
transport.py,cover
tree.py,cover
upgrade.py,cover
x
xu
xx
yp
tests/apache2.conf
tests/ra_backends.py
tests/test_branchprops1.py
tests/test_fileids.py.orig
tests/test_fileids.py.rej
tests/test_logwalker.py.rej
tests/tmpapache
------------------------------------------------------------
revno: 236.1.11.1.128
merged: jelmer at samba.org-20070106165818-4mt4qbtnyn6340h0
parent: jelmer at samba.org-20070103222400-7bjzm0ys0s39japf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2007-01-06 17:58:18 +0100
message:
Couple of minor fixes
------------------------------------------------------------
revno: 236.1.11.1.127
merged: jelmer at samba.org-20070103222400-7bjzm0ys0s39japf
parent: jelmer at samba.org-20070103121508-uccwc69drzhsk496
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-01-03 23:24:00 +0100
message:
Improve working tree handling.
------------------------------------------------------------
revno: 236.1.11.1.126
merged: jelmer at samba.org-20070103121508-uccwc69drzhsk496
parent: jelmer at samba.org-20070103111926-pxiao209rh4rw3x9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-01-03 13:15:08 +0100
message:
tests
------------------------------------------------------------
revno: 236.1.11.1.125
merged: jelmer at samba.org-20070103111926-pxiao209rh4rw3x9
parent: jelmer at samba.org-20070103104612-w2honujsz10jww2s
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-01-03 12:19:26 +0100
message:
Fix annoying bug in file id assignment code. "bzr status" works again
now on my Samba checkouts.
------------------------------------------------------------
revno: 236.1.11.1.124
merged: jelmer at samba.org-20070103104612-w2honujsz10jww2s
parent: jelmer at samba.org-20070103071312-9ncpsbv28tn3w19p
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-01-03 11:46:12 +0100
message:
Actually use fileid overrides when available.
------------------------------------------------------------
revno: 236.1.11.1.123
merged: jelmer at samba.org-20070103071312-9ncpsbv28tn3w19p
parent: jelmer at samba.org-20070103052419-l1ynpmaau0qyl9rq
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-01-03 08:13:12 +0100
message:
More tests.
------------------------------------------------------------
revno: 236.1.11.1.122
merged: jelmer at samba.org-20070103052419-l1ynpmaau0qyl9rq
parent: jelmer at samba.org-20070102191726-egizz156i4uclg8i
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2007-01-03 06:24:19 +0100
message:
Fix get_fileid_map() bugs.
------------------------------------------------------------
revno: 236.1.11.1.121
merged: jelmer at samba.org-20070102191726-egizz156i4uclg8i
parent: jelmer at samba.org-20070102173101-qxre26otn239fnxj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2007-01-02 20:17:26 +0100
message:
More efficient locking.
------------------------------------------------------------
revno: 236.1.11.1.120
merged: jelmer at samba.org-20070102173101-qxre26otn239fnxj
parent: jelmer at samba.org-20070102172120-gwa74fbqxipms3w2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2007-01-02 18:31:01 +0100
message:
And more corner cases...
------------------------------------------------------------
revno: 236.1.11.1.119
merged: jelmer at samba.org-20070102172120-gwa74fbqxipms3w2
parent: jelmer at samba.org-20070102170541-sn624spvprivr1q5
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2007-01-02 18:21:20 +0100
message:
Fix another corner case
------------------------------------------------------------
revno: 236.1.11.1.118
merged: jelmer at samba.org-20070102170541-sn624spvprivr1q5
parent: jelmer at samba.org-20070102165801-xugy31bdcorhwdcu
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2007-01-02 18:05:41 +0100
message:
More corner cases
------------------------------------------------------------
revno: 236.1.11.1.117
merged: jelmer at samba.org-20070102165801-xugy31bdcorhwdcu
parent: jelmer at samba.org-20070102155838-fwzkzqt2fyd2fd8c
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2007-01-02 17:58:01 +0100
message:
Support copying of branch parent directories.
------------------------------------------------------------
revno: 236.1.11.1.116
merged: jelmer at samba.org-20070102155838-fwzkzqt2fyd2fd8c
parent: jelmer at samba.org-20070102150408-ms9glmy9lcf3fb0a
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2007-01-02 16:58:38 +0100
message:
Fix progress bar, update TODO.
------------------------------------------------------------
revno: 236.1.11.1.115
merged: jelmer at samba.org-20070102150408-ms9glmy9lcf3fb0a
parent: jelmer at samba.org-20070102054543-veht1jei7cpx63tw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2007-01-02 16:04:08 +0100
message:
Add control_files.break_lock
------------------------------------------------------------
revno: 236.1.11.1.114
merged: jelmer at samba.org-20070102054543-veht1jei7cpx63tw
parent: jelmer at samba.org-20070102023936-utvizor7j13a0rze
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-01-02 06:45:43 +0100
message:
Add special character tests.
------------------------------------------------------------
revno: 236.1.11.1.113
merged: jelmer at samba.org-20070102023936-utvizor7j13a0rze
parent: jelmer at samba.org-20070102011143-vht8hgu5s3kmuxf3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-01-02 03:39:36 +0100
message:
More tests!
------------------------------------------------------------
revno: 236.1.11.1.112
merged: jelmer at samba.org-20070102011143-vht8hgu5s3kmuxf3
parent: jelmer at samba.org-20070102004553-kz46oy53p72cgm6j
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-01-02 02:11:43 +0100
message:
Add test.
------------------------------------------------------------
revno: 236.1.11.1.111
merged: jelmer at samba.org-20070102004553-kz46oy53p72cgm6j
parent: jelmer at samba.org-20070101221853-z74gmy058bm6z1j0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-01-02 01:45:53 +0100
message:
Add tests for load_dumpfile.
------------------------------------------------------------
revno: 236.1.11.1.110
merged: jelmer at samba.org-20070101221853-z74gmy058bm6z1j0
parent: jelmer at samba.org-20070101214906-cw23w5x9ytcf1ia0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 23:18:53 +0100
message:
Store file id maps when committing to Subversion. Fixes #54738.
------------------------------------------------------------
revno: 236.1.11.1.109
merged: jelmer at samba.org-20070101214906-cw23w5x9ytcf1ia0
parent: jelmer at samba.org-20070101214750-ro0wz5uf2bhknx08
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 22:49:06 +0100
message:
Initial work on supporting the 'bzr:file-ids' property.
------------------------------------------------------------
revno: 236.1.11.1.108
merged: jelmer at samba.org-20070101214750-ro0wz5uf2bhknx08
parent: jelmer at samba.org-20070101173622-q1h4vkjd9cuevxzd
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 22:47:50 +0100
message:
Ignore tags files.
Diff too large for email (2609, the limit is 1000).
More information about the bazaar-commits
mailing list