1 -----BEGIN PGP SIGNED MESSAGE-----
5 > Thinking about this some more, I think that the role of the
6 > main-branch is to officially sanction the current state of the code as
7 > "released". If a series of commits will leave a branch in a
8 > known-unusable form, they should be carried out in some appropriately
9 > named development branch. Then the log of commits to the main branch
10 > ("bzr log -n 1" for bzr > ) should produce a fairly respectable
13 This is how we develop bzr itself. The mainline is controlled by PQM,
14 which is a tool that merges feature branches, runs the tests, and
15 commits only if the tests pass.
17 $ bzr log --short --limit 10
18 4534 Canonical.com Patch Queue Manager 2009-07-14 [merge]
19 (abentley) Implement merge --interactive
21 4533 Canonical.com Patch Queue Manager 2009-07-14 [merge]
22 (jml) Merge in changes from 1.17 branch.
24 4532 Canonical.com Patch Queue Manager 2009-07-14 [merge]
25 (igc) zc.buildout Windows build support (Sidnei da Silva)
27 4531 Canonical.com Patch Queue Manager 2009-07-13 [merge]
28 (vila) Delete forgotten debug print
30 4530 Canonical.com Patch Queue Manager 2009-07-13 [merge]
31 (vila) Isolate some tests from TZ
33 4529 Canonical.com Patch Queue Manager 2009-07-13 [merge]
34 (igc) Bazaar 2.0 Upgrade Guide
36 4528 Canonical.com Patch Queue Manager 2009-07-13 [merge]
37 (mbp) correction to news
39 4527 Canonical.com Patch Queue Manager 2009-07-13 [merge]
40 (jml) Merge in 1.17 branch, updating version numbers and NEWS file.
42 4526 Canonical.com Patch Queue Manager 2009-07-10 [merge]
43 (mbp, vila) Finish the *_implementation to per_* test renaming
45 4525 Canonical.com Patch Queue Manager 2009-07-10 [merge]
46 (vila) Quicker check for changes in mutable trees
48 You can also see all the merges as they come into the mainline:
50 $ bzr log --short --limit 10 --include-merges
51 4534 Canonical.com Patch Queue Manager 2009-07-14 [merge]
52 (abentley) Implement merge --interactive
54 4526.6.15 Aaron Bentley 2009-07-14
57 4526.6.14 Aaron Bentley 2009-07-14
58 Use default DiffWriter.
60 4526.6.13 Aaron Bentley 2009-07-14
61 Add docstring to do_interactive.
63 4526.6.12 Aaron Bentley 2009-07-14
66 4526.6.11 Aaron Bentley 2009-07-13
69 4526.6.10 Aaron Bentley 2009-07-13 [merge]
70 Merged apply-vocab into merge-interactive.
72 4526.7.4 Aaron Bentley 2009-07-13 [merge]
73 Merged bzr.dev into apply-vocab.
75 4526.6.9 Aaron Bentley 2009-07-13 [merge]
76 Merged apply-vocab into merge-interactive.
78 4526.7.3 Aaron Bentley 2009-07-13
81 > This also means that _every_commit_ to a main branch would
82 > be an official release.
84 We don't do that. We have official releases every 4 weeks, but we do
85 believe that running bzr.dev is pretty safe, because it's always tested
86 and our test suite is quite thorough.
89 -----BEGIN PGP SIGNATURE-----
90 Version: GnuPG v1.4.9 (GNU/Linux)
91 Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
93 iEYEARECAAYFAkpcznIACgkQ0F+nu1YWqI0yhACePTFUUp6u+Dw+8IRwWOWBQRtb
94 TgsAniJq4lqnDfjNACMr7IEt7xYJhx7m
96 -----END PGP SIGNATURE-----