Rev 4023: Resolve NEWS conflicts. in http://people.ubuntu.com/~robertc/baz2.0/integration
Robert Collins
robertc at robertcollins.net
Fri Feb 20 00:45:26 GMT 2009
At http://people.ubuntu.com/~robertc/baz2.0/integration
------------------------------------------------------------
revno: 4023
revision-id: robertc at robertcollins.net-20090220004516-wif8t618qhm3alwv
parent: robertc at robertcollins.net-20090220004338-ctqo5e5hhbbkk25v
parent: pqm at pqm.ubuntu.com-20090219084345-0wx5gbw9v6hdmjmz
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2009-02-20 11:45:16 +1100
message:
Resolve NEWS conflicts.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 4011.1.9
revision-id: pqm at pqm.ubuntu.com-20090219084345-0wx5gbw9v6hdmjmz
parent: pqm at pqm.ubuntu.com-20090218235203-20qxqit61rkfwa1r
parent: robertc at robertcollins.net-20090219080129-r1h5npnyybteaohk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-02-19 08:43:45 +0000
message:
(robertc) Create remote BzrDir objects using the existing bzr:// RPC
method when. (Robert Collins)
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 4011.8.3
revision-id: robertc at robertcollins.net-20090219080129-r1h5npnyybteaohk
parent: robertc at robertcollins.net-20090219020654-1l19ged3zo7212jh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2009-02-19 19:01:29 +1100
message:
Review feedback.
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 4011.8.2
revision-id: robertc at robertcollins.net-20090219020654-1l19ged3zo7212jh
parent: robertc at robertcollins.net-20090219014143-wv42sc7z71wbhht0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Thu 2009-02-19 13:06:54 +1100
message:
Perform creation of BzrDirMetaFormat1 control directories using an RPC where possible. (Robert Collins)
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 4011.8.1
revision-id: robertc at robertcollins.net-20090219014143-wv42sc7z71wbhht0
parent: pqm at pqm.ubuntu.com-20090218132708-okubrahz9exvae9r
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Thu 2009-02-19 12:41:43 +1100
message:
Add BzrDirFormatMeta1 test for the amount of rpc calls made initializing over the network.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 4011.1.8
revision-id: pqm at pqm.ubuntu.com-20090218235203-20qxqit61rkfwa1r
parent: pqm at pqm.ubuntu.com-20090218212324-tz3ups4h8vg3j12t
parent: mbp at sourcefrog.net-20090218041504-1xlzucapzqwehryt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 23:52:03 +0000
message:
NEWS ReST syntax fix (mbp, trivial)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4011.7.1
revision-id: mbp at sourcefrog.net-20090218041504-1xlzucapzqwehryt
parent: pqm at pqm.ubuntu.com-20090218040347-uw2nm8ix8udwditt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2009-02-18 15:15:04 +1100
message:
Fix ReST syntax in NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4011.1.7
revision-id: pqm at pqm.ubuntu.com-20090218212324-tz3ups4h8vg3j12t
parent: pqm at pqm.ubuntu.com-20090218132708-okubrahz9exvae9r
parent: john at arbash-meinel.com-20090218160236-vjuspv4igqlijq7y
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 21:23:24 +0000
message:
(jam) Fix the new progress code to handle pb.tick() properly.
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 4011.6.1
revision-id: john at arbash-meinel.com-20090218160236-vjuspv4igqlijq7y
parent: pqm at pqm.ubuntu.com-20090218132708-okubrahz9exvae9r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: pb_tick
timestamp: Wed 2009-02-18 10:02:36 -0600
message:
Get a pb.tick() to work after calling pb.update()
Calling pb.tick() does an update with current_cnt = None.
This often is fine, as long as you haven't called update() before
with a total_count. Once total_count is set, then there were
code paths that didn't handle missing current_count.
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 4011.1.6
revision-id: pqm at pqm.ubuntu.com-20090218132708-okubrahz9exvae9r
parent: pqm at pqm.ubuntu.com-20090218094117-mum4jrw92j9ijj01
parent: jelmer at samba.org-20090218124823-acyczvvcfq9ztg3s
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 13:27:08 +0000
message:
(Jelmer) Point out bzr+ssh:// to the user when they use ssh://.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 4011.5.3
revision-id: jelmer at samba.org-20090218124823-acyczvvcfq9ztg3s
parent: jelmer at samba.org-20090218122204-1lc50dqq145kvd73
parent: pqm at pqm.ubuntu.com-20090218094117-mum4jrw92j9ijj01
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: ssh-hints
timestamp: Wed 2009-02-18 13:48:23 +0100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 4011.5.2
revision-id: jelmer at samba.org-20090218122204-1lc50dqq145kvd73
parent: jelmer at samba.org-20090217143926-2r3pmqphk99j72ex
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Wed 2009-02-18 13:22:04 +0100
message:
Register ssh: rather than ssh://, avoid referring to smart server, which users may not be familiar with.
modified:
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 4011.5.1
revision-id: jelmer at samba.org-20090217143926-2r3pmqphk99j72ex
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2009-02-17 15:39:26 +0100
message:
Point out bzr+ssh:// to the user when they use ssh://.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 4011.1.5
revision-id: pqm at pqm.ubuntu.com-20090218094117-mum4jrw92j9ijj01
parent: pqm at pqm.ubuntu.com-20090218084918-7d1qa881h8ahpu82
parent: jelmer at samba.org-20090218090055-2bt6b70yrv52zjx4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 09:41:17 +0000
message:
(Jelmer) Support GSSAPI authentication for HTTP and HTTPS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 4011.4.6
revision-id: jelmer at samba.org-20090218090055-2bt6b70yrv52zjx4
parent: jelmer at samba.org-20090217144626-rc6jt0qmfe950fp0
parent: pqm at pqm.ubuntu.com-20090218084918-7d1qa881h8ahpu82
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: http-gssapi
timestamp: Wed 2009-02-18 10:00:55 +0100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 4011.4.5
revision-id: jelmer at samba.org-20090217144626-rc6jt0qmfe950fp0
parent: jelmer at samba.org-20090217110548-n4k4hh28uhxx0vg1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: http-gssapi
timestamp: Tue 2009-02-17 15:46:26 +0100
message:
Move import next to other system libs, fix format.
modified:
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 4011.4.4
revision-id: jelmer at samba.org-20090217110548-n4k4hh28uhxx0vg1
parent: jelmer at samba.org-20090217021059-eyk0hufrwnanok1c
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: http-gssapi
timestamp: Tue 2009-02-17 12:05:48 +0100
message:
review from vila: mention HTTPS, clarify error a bit, move import to top-level.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 4011.4.3
revision-id: jelmer at samba.org-20090217021059-eyk0hufrwnanok1c
parent: jelmer at samba.org-20090217015430-62v560na6f1ngybp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: http-gssapi
timestamp: Tue 2009-02-17 03:10:59 +0100
message:
Remove realm support, it's not necessary.
modified:
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 4011.4.2
revision-id: jelmer at samba.org-20090217015430-62v560na6f1ngybp
parent: jelmer at samba.org-20090217013950-94zno65wcmx7kvb1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: http-gssapi
timestamp: Tue 2009-02-17 02:54:30 +0100
message:
Only attempt GSSAPI authentication when the kerberos module is present.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 4011.4.1
revision-id: jelmer at samba.org-20090217013950-94zno65wcmx7kvb1
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: http-gssapi
timestamp: Tue 2009-02-17 02:39:50 +0100
message:
Add simple support for GSSAPI authentication over HTTP.
modified:
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 4011.1.4
revision-id: pqm at pqm.ubuntu.com-20090218084918-7d1qa881h8ahpu82
parent: pqm at pqm.ubuntu.com-20090218051900-z4u214yqxrm7uvtl
parent: jelmer at samba.org-20090216163844-d8n3zc2ah5gudyi8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 08:49:18 +0000
message:
(Daniel) Add help option to shelve prompt.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 4010.1.2
revision-id: jelmer at samba.org-20090216163844-d8n3zc2ah5gudyi8
parent: jelmer at samba.org-20090216163752-hiq812wpsmiuduqp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Mon 2009-02-16 17:38:44 +0100
message:
Move NEWS item to DEVELOPMENT version from 1.12.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4010.1.1
revision-id: jelmer at samba.org-20090216163752-hiq812wpsmiuduqp
parent: pqm at pqm.ubuntu.com-20090216105404-hjw8bck3ocg47wjz
parent: daniel at daniel-watkins.co.uk-20090210004610-9d5uqzyds41pwte4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Mon 2009-02-16 17:37:52 +0100
message:
merge Daniels shelve help patch.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3990.4.4
revision-id: daniel at daniel-watkins.co.uk-20090210004610-9d5uqzyds41pwte4
parent: daniel at daniel-watkins.co.uk-20090210004348-l5pkl1g9rj9wddpy
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf-prompt
timestamp: Tue 2009-02-10 00:46:10 +0000
message:
Added NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3990.4.3
revision-id: daniel at daniel-watkins.co.uk-20090210004348-l5pkl1g9rj9wddpy
parent: daniel at daniel-watkins.co.uk-20090210004331-bm19sju6432fu3tx
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf-prompt
timestamp: Tue 2009-02-10 00:43:48 +0000
message:
Added help option to shelve prompt.
modified:
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
------------------------------------------------------------
revno: 3990.4.2
revision-id: daniel at daniel-watkins.co.uk-20090210004331-bm19sju6432fu3tx
parent: daniel at daniel-watkins.co.uk-20090210003348-iyfwr4dpfqsvn0ii
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf-prompt
timestamp: Tue 2009-02-10 00:43:31 +0000
message:
Added test for help option.
modified:
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3990.4.1
revision-id: daniel at daniel-watkins.co.uk-20090210003348-iyfwr4dpfqsvn0ii
parent: pqm at pqm.ubuntu.com-20090209210810-cq9lgqy519b7wfyi
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf-prompt
timestamp: Tue 2009-02-10 00:33:48 +0000
message:
Changed all shelve tests to expect a '?'.
modified:
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 4011.1.3
revision-id: pqm at pqm.ubuntu.com-20090218051900-z4u214yqxrm7uvtl
parent: pqm at pqm.ubuntu.com-20090218044142-j5oegz3puzoi82m1
parent: robertc at robertcollins.net-20090218042104-pf0hqv2bje74rvd1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 05:19:00 +0000
message:
(robertc) Add hpss push tests with hpss call ratchets to prevent
regressions, (Andrew Bennetts, Robert Collins)
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 4011.3.4
revision-id: robertc at robertcollins.net-20090218042104-pf0hqv2bje74rvd1
parent: robertc at robertcollins.net-20090218041442-k28bhmqhwko728u5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Wed 2009-02-18 15:21:04 +1100
message:
Make the ratchet aspect of the blackbox smart server push acceptance tests clearer.
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 4011.3.3
revision-id: robertc at robertcollins.net-20090218041442-k28bhmqhwko728u5
parent: robertc at robertcollins.net-20090218041128-nfgtpku9628f0h5x
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Wed 2009-02-18 15:14:42 +1100
message:
Adjust push acceptance/effort tests for correctness improvements in bzrlib which raised the figure.
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 4011.3.2
revision-id: robertc at robertcollins.net-20090218041128-nfgtpku9628f0h5x
parent: robertc at robertcollins.net-20090218000242-8lj7ewn31dmwh5q3
parent: pqm at pqm.ubuntu.com-20090218040347-uw2nm8ix8udwditt
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Wed 2009-02-18 15:11:28 +1100
message:
Merge bzr.dev for the use-RemoteObjects when initial pushing.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 4011.3.1
revision-id: robertc at robertcollins.net-20090218000242-8lj7ewn31dmwh5q3
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Wed 2009-02-18 11:02:42 +1100
message:
Add ratchet style blackbox effort tests for push over bzr+ssh. (Andrew Bennetts, Robert Collins)
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 4011.1.2
revision-id: pqm at pqm.ubuntu.com-20090218044142-j5oegz3puzoi82m1
parent: pqm at pqm.ubuntu.com-20090218040347-uw2nm8ix8udwditt
parent: john at arbash-meinel.com-20090218033847-e5th2txcqscbe4uv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 04:41:42 +0000
message:
(jam) Add a -Dmemory implementation for win32
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 4011.2.3
revision-id: john at arbash-meinel.com-20090218033847-e5th2txcqscbe4uv
parent: john at arbash-meinel.com-20090218032811-cbuu15u5xobpltv9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_mem
timestamp: Tue 2009-02-17 21:38:47 -0600
message:
NEWS about -Dmemory and win32
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4011.2.2
revision-id: john at arbash-meinel.com-20090218032811-cbuu15u5xobpltv9
parent: john at arbash-meinel.com-20090218030943-j3dhzwnijugzim61
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_mem
timestamp: Tue 2009-02-17 21:28:11 -0600
message:
Fix some small bugs, and prefer the ctypes form.
modified:
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 4011.2.1
revision-id: john at arbash-meinel.com-20090218030943-j3dhzwnijugzim61
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_mem
timestamp: Tue 2009-02-17 21:09:43 -0600
message:
Implement -Dmemory for win32
modified:
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 4011.1.1
revision-id: pqm at pqm.ubuntu.com-20090218040347-uw2nm8ix8udwditt
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
parent: robertc at robertcollins.net-20090218032521-m2bl20b63q57mmxj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 04:03:47 +0000
message:
(robertc) Fix RemoteBranch to be used correctly in tests using
bzr+ssh, to fire off Branch hooks correctly,
and improve the branch_implementations tests to check that making a
branch gets the right format under test. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 4005.2.3
revision-id: robertc at robertcollins.net-20090218032521-m2bl20b63q57mmxj
parent: robertc at robertcollins.net-20090218001303-anak652jzjqu02d2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2009-02-18 14:25:21 +1100
message:
Fix test failure due to shared format objects being returned from initialize_on_transport.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 4005.2.2
revision-id: robertc at robertcollins.net-20090218001303-anak652jzjqu02d2
parent: robertc at robertcollins.net-20090213005218-yxrgiq7j1du2vldm
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2009-02-18 11:13:03 +1100
message:
Merge bzr.dev [fix NEWS conflicts].
added:
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
tools/prepare_for_latex.py prepare_for_latex.py-20090212165735-79tn1t4dhnxyz7m9-1
tools/rst2pdf.py rst2pdf.py-20090212165735-79tn1t4dhnxyz7m9-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 4005.2.1
revision-id: robertc at robertcollins.net-20090213005218-yxrgiq7j1du2vldm
parent: pqm at pqm.ubuntu.com-20090212154913-cleqwmh36ss3gswk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: format-on-push
timestamp: Fri 2009-02-13 11:52:18 +1100
message:
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
Diff too large for email (1976 lines, the limit is 1000).
More information about the bazaar-commits
mailing list