Merge lp:~ian-clatworthy/bzr/whats-new-in-2.1 into lp:bzr/2.1

Proposed by Ian Clatworthy on 2010-02-19
Status: Merged
Approved by: Andrew Bennetts on 2010-02-19
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~ian-clatworthy/bzr/whats-new-in-2.1
Merge into: lp:bzr/2.1
Diff against target: 258 lines (+212/-1)
4 files modified
NEWS (+5/-0)
doc/en/_templates/index.html (+4/-1)
doc/en/index.txt (+1/-0)
doc/en/whats-new/whats-new-in-2.1.txt (+202/-0)
To merge this branch: bzr merge lp:~ian-clatworthy/bzr/whats-new-in-2.1
Reviewer Review Type Date Requested Status
Andrew Bennetts Approve on 2010-02-19
Martin Pool 2010-02-19 Approve on 2010-02-19
Review via email: mp+19677@code.launchpad.net
To post a comment you must log in.
Ian Clatworthy (ian-clatworthy) wrote :

As discussed on the mailing list, this patch adds a What's New document summarsing the changes since 2.0.

Martin Pool (mbp) wrote :

<poolie> thanks for that igc
<igc> poolie: as in the What's New doc?
<poolie> mm, it's good
<igc> I think so :-)
<poolie> i would add the url launchpad.net/bzr/2.1 in the 'milestones' thing at the end
<poolie> and maybe a link to news

review: Approve
Andrew Bennetts (spiv) wrote :

Typo:

+* Added What's New in Bazar 2.1 document. (Ian Clatworthy)

That one would be a bit embarassing! :)

The rest looks good after a quick read. We can always keep tweaking after it lands if necessary, so let's land it!

(After fixing the typo, of course!)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2010-02-17 23:40:51 +0000
+++ NEWS 2010-02-19 03:22:11 +0000
@@ -23,6 +23,11 @@
2323
24* Merge correctly when this_tree is not a WorkingTree. (Aaron Bentley)24* Merge correctly when this_tree is not a WorkingTree. (Aaron Bentley)
2525
26Documentation
27*************
28
29* Added What's New in Bazar 2.1 document. (Ian Clatworthy)
30
2631
27bzr 2.1.032bzr 2.1.0
28#########33#########
2934
=== modified file 'doc/en/_templates/index.html'
--- doc/en/_templates/index.html 2010-01-08 00:27:40 +0000
+++ doc/en/_templates/index.html 2010-02-19 03:22:11 +0000
@@ -7,6 +7,9 @@
77
8 <table class="contentstable" align="center" style="margin-left: 30px"><tr>8 <table class="contentstable" align="center" style="margin-left: 30px"><tr>
9 <td width="50%">9 <td width="50%">
10 <p class="biglink"><a class="biglink" href="{{ pathto("whats-new/whats-new-in-2.1") }}">What's New in Bazaar 2.1?</a><br/>
11 <span class="linkdescr">what's new in this release</span>
12 </p>
10 <p class="biglink"><a class="biglink" href="{{ pathto("user-guide/index") }}">User Guide</a><br/>13 <p class="biglink"><a class="biglink" href="{{ pathto("user-guide/index") }}">User Guide</a><br/>
11 <span class="linkdescr">how to use Bazaar effectively</span>14 <span class="linkdescr">how to use Bazaar effectively</span>
12 </p>15 </p>
@@ -18,7 +21,7 @@
18 </p>21 </p>
19 </td><td width="50%">22 </td><td width="50%">
20 <p class="biglink"><a class="biglink" href="{{ pathto("release-notes/index") }}">Release Notes</a><br/>23 <p class="biglink"><a class="biglink" href="{{ pathto("release-notes/index") }}">Release Notes</a><br/>
21 <span class="linkdescr">what's new</span>24 <span class="linkdescr">a detailed log of changes</span>
22 </p>25 </p>
23 <p class="biglink"><a class="biglink" href="{{ pathto("upgrade-guide/index") }}">Upgrade Guide</a><br/>26 <p class="biglink"><a class="biglink" href="{{ pathto("upgrade-guide/index") }}">Upgrade Guide</a><br/>
24 <span class="linkdescr">moving to Bazaar 2.x</span>27 <span class="linkdescr">moving to Bazaar 2.x</span>
2528
=== modified file 'doc/en/index.txt'
--- doc/en/index.txt 2009-12-07 18:12:21 +0000
+++ doc/en/index.txt 2010-02-19 03:22:11 +0000
@@ -10,6 +10,7 @@
10.. toctree::10.. toctree::
11 :maxdepth: 111 :maxdepth: 1
1212
13 whats-new/whats-new-in-2.1
13 user-guide/index14 user-guide/index
14 tutorials/index15 tutorials/index
15 quick-reference/index16 quick-reference/index
1617
=== added directory 'doc/en/whats-new'
=== added file 'doc/en/whats-new/whats-new-in-2.1.txt'
--- doc/en/whats-new/whats-new-in-2.1.txt 1970-01-01 00:00:00 +0000
+++ doc/en/whats-new/whats-new-in-2.1.txt 2010-02-19 03:22:11 +0000
@@ -0,0 +1,202 @@
1What's New in Bazaar 2.1?
2=========================
3
4This document outlines the major improvements in Bazaar 2.1
5vs Bazaar 2.0. As well as summarizing improvements made to
6the core product, it highlights enhancements within the broader
7Bazaar world of potential interest to those upgrading.
8
9Bazaar 2.1.0 marks the start of our second long-term-stable series.
10This series will be supported with bug fixes for the next 12 months.
11All users are encouraged to upgrade from the 2.0.x stable series.
12
13
14Better efficiency
15-----------------
16
17Many operations now consume less memory. Several operations are
18also faster including branching, logging merged revisions and
19upgrading from pre-2a to 2a format.
20
21
22New command options
23-------------------
24
25Several commands have new options. These include:
26
27=========== ============== ======================================
28Command Option Description
29=========== ============== ======================================
30branch bind Bind to the source location
31commit commit-time Give an explicit commit timestamp
32switch revision Switch to a particular revision
33unshelve keep Apply changes but don't delete them
34unshelve preview Show the diff that would result from
35 unshelving
36update revision Update to a particular revision
37=========== ============== ======================================
38
39Other command improvements include:
40
41* A :doc:`../user-reference/shelve-help` editor can be defined to provide shelf functionality at
42 a granularity finer than per-patch hunk.
43
44* :doc:`../user-reference/send-help` send now supports the OS X Mail application.
45
46See the help for the commands above for further details.
47
48
49Per-file merge hooks
50--------------------
51
52Hooks can now be defined for smart merging of selected file types.
53This enables easier merging of ChangeLogs, Release Notes and other
54file that frequently conflict.
55
56
57DWIM revision identifiers
58-------------------------
59
60Revision identifiers can now be given in a *Do-What-I-Mean* style.
61For example, you can now just give a tag (instead of saying ``tag:xxx``)
62or just say ``today`` (instead of saying ``date:today``). Prefixes
63are now only required if the revision spec could be ambiguous.
64
65
66New ignore patterns
67-------------------
68
69Patterns prefixed with ``!`` are exceptions to ignore patterns and
70take precedence over regular ignores. Such exceptions are used to
71specify files that should be versioned which would otherwise be
72ignored. Patterns prefixed with ``!!`` act as regular ignore patterns,
73but have highest precedence, even over the ``!`` exception patterns.
74
75
76Smart server home directory support
77-----------------------------------
78
79``bzr+ssh`` and ``bzr`` paths can now be relative to home directories
80specified in the URL. Paths starting with a path segment of ``~`` are
81relative to the home directory of the user running the server, and paths
82starting with ``~user`` are relative to the home directory of the named
83user. For example, for a user "bob" with a home directory of
84``/home/bob``, these URLs are all equivalent:
85
86* ``bzr+ssh://bob@host/~/repo``
87* ``bzr+ssh://bob@host/~bob/repo``
88* ``bzr+ssh://bob@host/home/bob/repo``
89
90If ``bzr serve`` was invoked with a ``--directory`` argument, then no
91home directories outside that directory will be accessible via this
92method.
93
94This is a feature of ``bzr serve``, so pre-2.1 clients will
95automatically benefit from this feature when ``bzr`` on the server is
96upgraded.
97
98
99Generalized glob support on Windows
100-----------------------------------
101
102On Windows, glob expansion is now handled in a universal way across
103all commands. In previous versions, it was explicitly handed by just
104a few commands, e.g. ``add``. A side effect of this change is that
105patterns now need to be quoted when passed to the ``ignore`` command,
106e.g. ``bzr ignore *.foo`` now needs to be given as ``bzr ignore "*.foo"``.
107
108
109Improved Git and Mercurial interoperability
110-------------------------------------------
111
112Many improvements have been made to the git_ and hg_ plugins.
113With these plugins installed, most Git and Mercurial repositories
114can now be read by standard Bazaar clients. Changes can also
115be written back via the dpush command.
116
117.. _git: http://doc.bazaar.canonical.com/plugins/en/git-plugin.html
118.. _hg: http://doc.bazaar.canonical.com/plugins/en/hg-plugin.html
119
120
121Metaprojects
122------------
123
124New plugins are available for constructing larger projects
125from smaller ones. These include:
126
127* builder_ - construction of a branch using recipes
128* externals_ - Subversion-style external branches
129
130.. note::
131
132 The builder plugin has been designed to complement the builddeb_
133 plugin to streamline Debian source package management. It may also
134 be useful for building test images for a QA team or disk images
135 for installers, say.
136
137.. _builder: http://doc.bazaar.canonical.com/plugins/en/builder-plugin.html
138.. _externals: http://doc.bazaar.canonical.com/plugins/en/externals-plugin.html
139.. _builddeb: http://doc.bazaar.canonical.com/plugins/en/builddeb-plugin.html
140
141
142Colocated branch workspaces
143---------------------------
144
145A colocated workspace is one where a single working tree is used
146across one or more branches managed at that same location. This
147is now supported by the new colo_ plugin and by Bazaar Explorer.
148
149.. _colo: http://doc.bazaar.canonical.com/plugins/en/colo-plugin.html
150
151
152Better documentation
153--------------------
154
155A :doc:`../admin-guide/index` covering topics such as setting up servers,
156security, backups and email integration has been added.
157
158A large number of documentation bugs have been fixed, clarifying
159numerous issues and filling in some missing holes.
160
161The :doc:`../user-reference/index`
162has been organized into topics making it easier to
163navigate through and print selected sections of.
164
165To assist users migrating from other tools, a
166`Survival Guide <http://doc.bazaar.canonical.com/migration/en/survival/index.html>`_
167has been published explaining Bazaar to users of other tools in terms they
168already know. Sections are provided for existing users of
169CVS, Subversion, ClearCase, Perforce, Visual SourceSafe, Git, Mercurial,
170Darcs and Monotone.
171
172Selected documents have also been translated to Japanese.
173
174
175Enhanced GUI clients
176--------------------
177
178Numerous enhancements have been made to most of our GUIs including
179Bazaar Explorer, TortoiseBZR and the QBzr-Eclipse add-on. These
180applications all build on top of improvements made to QBzr. Bzr-gtk
181has also been improved.
182
183Bazaar Explorer has over a dozen new featuring including smart toolbars,
184support for all bzr commands (including those in plugins),
185a better working tree browser and a submit delta report showing the
186cumulative effect of a series of commits.
187See `What's New in Bazaar Explorer 1.0?
188<http://doc.bazaar.canonical.com/explorer/en/whats-new/whats-new-in-1.0.html>`_
189for more information.
190
191
192Further information
193-------------------
194
195For more detailed information on the changes made, be sure to check
196the Release Notes for:
197
198* the interim bzr milestones
199* the plugins you use.
200
201Enjoy,
202The Bazaar Development Team

Subscribers

People subscribed via source and target branches