Rev 455: Merge support for true push and commits to heavy checkouts. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
Jelmer Vernooij
jelmer at samba.org
Fri May 18 19:08:04 BST 2007
At http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
------------------------------------------------------------
revno: 455
revision-id: jelmer at samba.org-20070518180802-s4q66h2c1doer83a
parent: jelmer at samba.org-20070517165231-jhmgh86gq5pzifuu
parent: jelmer at samba.org-20070518180127-pbj2l7tgikgxe77h
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Fri 2007-05-18 19:08:02 +0100
message:
Merge support for true push and commits to heavy checkouts.
added:
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_revids.py test_revids.py-20070516230044-d7x872cqi7xb4eow-1
modified:
.bzrignore bzrignore-20060516185138-862ea098064007af
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
checkout.py workingtree.py-20060306120941-b083cb0fdd4a69de
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
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
mapping.txt mapping.txt-20060625151311-9ghaqrm71ajq593n-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
------------------------------------------------------------
revno: 421.1.24
merged: jelmer at samba.org-20070518180127-pbj2l7tgikgxe77h
parent: jelmer at samba.org-20070518173705-7e51s6m9bdn3h6wd
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Fri 2007-05-18 19:01:27 +0100
message:
Support commits in heavy checkouts.
------------------------------------------------------------
revno: 421.1.23
merged: jelmer at samba.org-20070518173705-7e51s6m9bdn3h6wd
parent: jelmer at samba.org-20070518164929-14kc2rnucp1bx60y
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Fri 2007-05-18 18:37:05 +0100
message:
Fix bind.
------------------------------------------------------------
revno: 421.1.22
merged: jelmer at samba.org-20070518164929-14kc2rnucp1bx60y
parent: jelmer at samba.org-20070518151130-cy22ujf5331vk8wr
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Fri 2007-05-18 17:49:29 +0100
message:
Fix the test suite, add tests for committing to heavyweight checkouts.
------------------------------------------------------------
revno: 421.1.21
merged: jelmer at samba.org-20070518151130-cy22ujf5331vk8wr
parent: jelmer at samba.org-20070518124612-sisoj3464r5wteu1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Fri 2007-05-18 16:11:30 +0100
message:
Reduce the number of properties used.
------------------------------------------------------------
revno: 421.1.20
merged: jelmer at samba.org-20070518124612-sisoj3464r5wteu1
parent: jelmer at samba.org-20070518122257-v826cvviwuo5xq8b
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Fri 2007-05-18 13:46:12 +0100
message:
Fix custom revision ids for per-file revision ids.
------------------------------------------------------------
revno: 421.1.19
merged: jelmer at samba.org-20070518122257-v826cvviwuo5xq8b
parent: jelmer at samba.org-20070518110606-ghip0jetjq210xdg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Fri 2007-05-18 13:22:57 +0100
message:
True push works, with some limits.
------------------------------------------------------------
revno: 421.1.18
merged: jelmer at samba.org-20070518110606-ghip0jetjq210xdg
parent: jelmer at samba.org-20070518020115-f6opp2673mhvc9sg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Fri 2007-05-18 12:06:06 +0100
message:
Add separate tests for push-as-merged.
------------------------------------------------------------
revno: 421.1.17
merged: jelmer at samba.org-20070518020115-f6opp2673mhvc9sg
parent: jelmer at samba.org-20070518014626-kjicpl6y6qi5kad0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Fri 2007-05-18 03:01:15 +0100
message:
Support custom revision ids. True push is now just an hour or two away.................
------------------------------------------------------------
revno: 421.1.16
merged: jelmer at samba.org-20070518014626-kjicpl6y6qi5kad0
parent: jelmer at samba.org-20070518012526-sm3mjnioq93ub9iq
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Fri 2007-05-18 02:46:26 +0100
message:
Fix more custom revid tests.
------------------------------------------------------------
revno: 421.1.15
merged: jelmer at samba.org-20070518012526-sm3mjnioq93ub9iq
parent: jelmer at samba.org-20070518004338-7iyyvupsj2en6tld
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Fri 2007-05-18 02:25:26 +0100
message:
Support setting the revision id on commits from lightweight checkouts.
------------------------------------------------------------
revno: 421.1.14
merged: jelmer at samba.org-20070518004338-7iyyvupsj2en6tld
parent: jelmer at samba.org-20070517190430-nkqegxcff1gdobe4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Fri 2007-05-18 01:43:38 +0100
message:
Add some tests for the custom revisions.
------------------------------------------------------------
revno: 421.1.13
merged: jelmer at samba.org-20070517190430-nkqegxcff1gdobe4
parent: jelmer at samba.org-20070517190319-4p4vx3gl0mzjotd2
parent: jelmer at samba.org-20070517165231-jhmgh86gq5pzifuu
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Thu 2007-05-17 20:04:30 +0100
message:
Merge upstream.
------------------------------------------------------------
revno: 421.1.12
merged: jelmer at samba.org-20070517190319-4p4vx3gl0mzjotd2
parent: jelmer at samba.org-20070517123813-4iij1urq1vea0spi
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Thu 2007-05-17 20:03:19 +0100
message:
Some more work towards custom revision ids.
------------------------------------------------------------
revno: 421.1.11
merged: jelmer at samba.org-20070517123813-4iij1urq1vea0spi
parent: jelmer at samba.org-20070517110929-wc2u2ow9zbbausfn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Thu 2007-05-17 13:38:13 +0100
message:
Start filling in code to create the revid cache.
------------------------------------------------------------
revno: 421.1.10
merged: jelmer at samba.org-20070517110929-wc2u2ow9zbbausfn
parent: jelmer at samba.org-20070516230120-uuh3vny3euhn152h
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Thu 2007-05-17 12:09:29 +0100
message:
Add insert function.
------------------------------------------------------------
revno: 421.1.9
merged: jelmer at samba.org-20070516230120-uuh3vny3euhn152h
parent: jelmer at samba.org-20070516134309-1kmi1dajlhf8rf01
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Thu 2007-05-17 00:01:20 +0100
message:
Start working on revision id map.
------------------------------------------------------------
revno: 421.1.8
merged: jelmer at samba.org-20070516134309-1kmi1dajlhf8rf01
parent: jelmer at samba.org-20070416232957-4p8w07zrz9fgjk96
parent: jelmer at samba.org-20070516133028-ykjexckioosx0vtn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Wed 2007-05-16 14:43:09 +0100
message:
Merge upstream.
------------------------------------------------------------
revno: 421.1.7
merged: jelmer at samba.org-20070416232957-4p8w07zrz9fgjk96
parent: jelmer at samba.org-20070416013009-i1fs5ukhj3hg1i1i
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Tue 2007-04-17 01:29:57 +0200
message:
Move revid code to separate file in preparation of expansion.
------------------------------------------------------------
revno: 421.1.6
merged: jelmer at samba.org-20070416013009-i1fs5ukhj3hg1i1i
parent: jelmer at samba.org-20070415173504-fiwgffj0ijbvqj44
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Mon 2007-04-16 03:30:09 +0200
message:
Fix a couple of tests.
------------------------------------------------------------
revno: 421.1.5
merged: jelmer at samba.org-20070415173504-fiwgffj0ijbvqj44
parent: jelmer at samba.org-20070414180015-n29pge396twclo2t
parent: jelmer at samba.org-20070415161553-4s5vprta60mch70r
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Sun 2007-04-15 19:35:04 +0200
message:
Merge upstream, add helper function for parsing revision ids on branches.
------------------------------------------------------------
revno: 421.1.4
merged: 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
------------------------------------------------------------
revno: 421.1.3
merged: jelmer at samba.org-20070306001157-r1lnuw8wn7b8j8g9
parent: jelmer at samba.org-20070306000852-1cosj7bj8khc5x7h
parent: jelmer at samba.org-20070304125003-20rzetkgu0l40mxc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Tue 2007-03-06 01:11:57 +0100
message:
Merge upstream.
------------------------------------------------------------
revno: 421.1.2
merged: jelmer at samba.org-20070306000852-1cosj7bj8khc5x7h
parent: jelmer at samba.org-20070201173614-9rzjpk5puez5rj11
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Tue 2007-03-06 01:08:52 +0100
message:
Add test for overridden revids.
------------------------------------------------------------
revno: 421.1.1
merged: jelmer at samba.org-20070201173614-9rzjpk5puez5rj11
parent: jelmer at samba.org-20070201103709-z4xm1j5cwaezzxt0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Thu 2007-02-01 18:36:14 +0100
message:
Initial work on push and support for setting revision id during commit.
Diff too large for email (2519 lines, the limit is 1000).
More information about the bazaar-commits
mailing list