At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/1.7rc2

------------------------------------------------------------
revno: 3705
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: 1.7rc2
timestamp: Tue 2008-09-16 17:15:49 -0500
message:
  Merge and resolve NEWS
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3699.1.2
    revision-id: [EMAIL PROTECTED]
    parent: [EMAIL PROTECTED]
    parent: [EMAIL PROTECTED]
    committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
    branch nick: 1.7
    timestamp: Tue 2008-09-16 01:11:52 +0100
    message:
      Branching from a shared repository on a smart server now preserves
        repository format (Andrew Bennetts)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/tests/repository_implementations/__init__.py 
__init__.py-20060131092037-9564957a7d4a841b
      bzrlib/tests/repository_implementations/test_repository.py 
test_repository.py-20060131092128-ad07f494f5c9d26c
        ------------------------------------------------------------
        revno: 3699.2.3
        revision-id: [EMAIL PROTECTED]
        parent: [EMAIL PROTECTED]
        committer: Andrew Bennetts <[EMAIL PROTECTED]>
        branch nick: wrong-repo-format-1.7
        timestamp: Tue 2008-09-16 09:38:59 +1000
        message:
          Add NEWS entry.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3699.2.2
        revision-id: [EMAIL PROTECTED]
        parent: [EMAIL PROTECTED]
        committer: Andrew Bennetts <[EMAIL PROTECTED]>
        branch nick: wrong-repo-format-1.7
        timestamp: Mon 2008-09-15 11:54:57 +1000
        message:
          Add test for preserving shared repository format when sprouting from 
a smart server.
        modified:
          bzrlib/tests/repository_implementations/__init__.py 
__init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/repository_implementations/test_repository.py 
test_repository.py-20060131092128-ad07f494f5c9d26c
        ------------------------------------------------------------
        revno: 3699.2.1
        revision-id: [EMAIL PROTECTED]
        parent: [EMAIL PROTECTED]
        committer: Andrew Bennetts <[EMAIL PROTECTED]>
        branch nick: wrong-repo-format-1.7
        timestamp: Mon 2008-09-15 11:08:34 +1000
        message:
          Possible fix for bug 269214
        modified:
          bzrlib/bzrdir.py               
bzrdir.py-20060131065624-156dfea39c4387cb
    ------------------------------------------------------------
    revno: 3699.1.1
    revision-id: [EMAIL PROTECTED]
    parent: [EMAIL PROTECTED]
    parent: [EMAIL PROTECTED]
    committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
    branch nick: 1.7
    timestamp: Fri 2008-09-12 08:30:13 +0100
    message:
      (spiv) Fix '_in_buffer' AttributeError when using the -Dhpss debug
        flag.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/smart/message.py        
message.py-20080222013625-ncqmh3nrxjkxab87-1
      bzrlib/smart/protocol.py       
protocol.py-20061108035435-ot0lstk2590yqhzr-1
=== modified file 'NEWS'
--- a/NEWS      2008-09-16 21:38:29 +0000
+++ b/NEWS      2008-09-16 22:15:49 +0000
@@ -9,8 +9,9 @@
 
   BUG FIXES:
 
-    * ``bzr branch bzr+ssh://`` will properly preserve the format when
-      branching from a non-default format. (Andrew Bennetts)
+    * Branching from a shared repository on a smart server into a new
+      repository now preserves the repository format.
+      (Andrew Bennetts, #269214)
 
     * Fix '_in_buffer' AttributeError when using the -Dhpss debug flag.
       (Andrew Bennetts)

-- 
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits

Reply via email to