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

Subscribers

People subscribed via source and target branches