Rev 3642: (jam) Merge in 1.6rc5 and revert disabling default stack on policy in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Aug 20 17:45:56 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3642
revision-id: pqm at pqm.ubuntu.com-20080820164550-e4vt9gdxv8hlic7n
parent: pqm at pqm.ubuntu.com-20080819152536-6oobtmrum8e34h8l
parent: john at arbash-meinel.com-20080820161409-pl5tzssd7wlxi7ma
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-08-20 17:45:50 +0100
message:
(jam) Merge in 1.6rc5 and revert disabling default stack on policy
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3641.1.1
revision-id: john at arbash-meinel.com-20080820161409-pl5tzssd7wlxi7ma
parent: pqm at pqm.ubuntu.com-20080819152536-6oobtmrum8e34h8l
parent: pqm at pqm.ubuntu.com-20080819231728-vrtdr5jyvvzquhcj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2008-08-20 11:14:09 -0500
message:
Merge in 1.6rc5 and revert disabling default stack on policy
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3606.5.8
revision-id: pqm at pqm.ubuntu.com-20080819231728-vrtdr5jyvvzquhcj
parent: pqm at pqm.ubuntu.com-20080819221503-jvqhmuigxbdpelbd
parent: john at arbash-meinel.com-20080819224532-n720ccihpygyaz39
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Wed 2008-08-20 00:17:28 +0100
message:
(jam) Fix the release date for 1.6rc5
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3606.8.4
revision-id: john at arbash-meinel.com-20080819224532-n720ccihpygyaz39
parent: john at arbash-meinel.com-20080819214515-7wsqo3bdfui2lejq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stacking_policy
timestamp: Tue 2008-08-19 17:45:32 -0500
message:
Fix the release date for 1.6rc5
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3606.5.7
revision-id: pqm at pqm.ubuntu.com-20080819221503-jvqhmuigxbdpelbd
parent: pqm at pqm.ubuntu.com-20080818234533-ixoxs0ca9kygqe0m
parent: john at arbash-meinel.com-20080819214515-7wsqo3bdfui2lejq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Tue 2008-08-19 23:15:03 +0100
message:
(jam) Disable detecting stack-on policy from a containing BzrDir
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3606.8.3
revision-id: john at arbash-meinel.com-20080819214515-7wsqo3bdfui2lejq
parent: john at arbash-meinel.com-20080819213740-x0z2gh94t15ofcko
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stacking_policy
timestamp: Tue 2008-08-19 16:45:15 -0500
message:
push doesn't notify because it doesn't notice by default.
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 3606.8.2
revision-id: john at arbash-meinel.com-20080819213740-x0z2gh94t15ofcko
parent: john at arbash-meinel.com-20080819210422-rqtvebr36783vpqy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stacking_policy
timestamp: Tue 2008-08-19 16:37:40 -0500
message:
Prepare 1.6rc5
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.8.1
revision-id: john at arbash-meinel.com-20080819210422-rqtvebr36783vpqy
parent: pqm at pqm.ubuntu.com-20080818234533-ixoxs0ca9kygqe0m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stacking_policy
timestamp: Tue 2008-08-19 16:04:22 -0500
message:
Disable auto-detecting the default stacking url
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
=== modified file 'NEWS'
--- a/NEWS 2008-08-19 14:54:08 +0000
+++ b/NEWS 2008-08-20 16:14:09 +0000
@@ -65,6 +65,18 @@
(Robert Collins, Aaron Bentley)
+bzr 1.6rc5 2008-08-19
+---------------------
+
+ BUG FIXES:
+
+ * Disable automatic detection of stacking based on a containing
+ directory of the target. It interacted badly with push, and needs a
+ bit more work to get the edges polished before it should happen
+ automatically. (John Arbash Meinel, #259275)
+ (This change was reverted when merged to bzr.dev)
+
+
bzr 1.6rc4 2008-08-18
---------------------
More information about the bazaar-commits
mailing list