/breezy-loom/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy-loom/trunk
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
----------------------
bzr-loom Release Notes
----------------------

.. contents::

IN DEVELOPMENT
==============

NOTES WHEN UPGRADING
--------------------

CHANGES
-------

FEATURES
--------

IMPROVEMENTS
------------

BUGFIXES
--------

API BREAKS
----------

TESTING
-------

INTERNALS
---------

2.2
===

NOTES WHEN UPGRADING
--------------------

* bzr-loom requires bzr 2.4.0 due to API changes in bzr. On older versions of
  bzr bzr-loom will still work for most operations but will fail when making
  new branches as part of a push or branch operation. (Robert Collins, #201613)

CHANGES
-------

* --auto is now the default on up-thread. You can supply a thread name to stop
  at a given thread, or --manual to go up a single thread. (Aaron Bentley)

* ``bzr combine-thread`` now accepts a ``--force`` option.

FEATURES
--------

* A new revision specifier ``below:`` has been added. (Robert Collins, #195282)

IMPROVEMENTS
------------

* bzr-loom is now compatible with bzr 2.3b5 and newer.  There were some API
  additions bzr-loom needed to support.  Compatibility with earlier versions is
  unaffected.  (Andrew Bennetts)

* Loom now takes advantage of lazy loading of bzr objects (though not to a
  complete degree), reducing the overhead of having it installed.
  (Robert Collins)

* Loom now registers a ``bzr status`` hook rather than overriding the
  ``bzr status`` command. (Jelmer Vernooij)

* Loom now checks that a compatible version of bzr is being used.
  (Jelmer Vernooij, #338214)

BUGFIXES
--------

* ``bzr combine-thread`` will no longer combine threads without ``--force``
  when the thread being removed has work not merged into either the thread
  above or below. (Robert Collins, #506235)

* ``bzr loomify`` explicitly checks that branches being converted are not Looms
  already. This should not have been needed, but apparently it was.
  (Robert Collins, #600452)

* ``bzr nick`` will now rename a thread rather than setting the current thread
  pointer to an invalid value. (Robert Collins, #203203, #260947, #304608)

* ``bzr nick`` will now rename the branch too. (Vincent Ladeuil, #606174)

* ``switch`` now accepts the ``--directory`` option. (Vincent Ladeuil, #595563)

* The ``thread:`` revision specifier will no longer throw an attribute error
  when used on a normal branch. (Robert Collins, #231283)

* The ``bzr status`` hook for looms will no longer crash on non-workingtree
  trees. (Jelmer Vernooij, #904095)

API BREAKS
----------

TESTING
-------

INTERNALS
---------

2.1
===

  NOTES WHEN UPGRADING:
  
  CHANGES:

  FEATURES:

  IMPROVEMENTS:

  BUGFIXES:

  * Stop using APIs deprecated for 2.1.0 (child progress bars for
    merge and trace.info). (Vincent Ladeuil, #528472)

  * Work with changes to bzr trunk - colocated branches and switch -r.

  API BREAKS:

  TESTING:

  INTERNALS:

  * .testr.conf added to help use with testr - still need to specify what tests
    to run. (Robert Collins)

2.0
===

  NOTES WHEN UPGRADING:
  
  CHANGES:

  FEATURES:

  IMPROVEMENTS:

    * ``bzr status`` now shows the current thread of the loom. (Jonathan
      Lange, #232465)

    * ``bzr switch`` now accepts ``top:`` and ``bottom:`` to jump to the top
      and bottom thread respectively. (Jonathan Lange)

    * ``bzr switch -b newthread`` now works. (Robert Collins, #433811)

    * ``bzr push`` now pushes the last-loom rather than creating an empty loom.
      (Robert Collins, #201613)

    * ``up`` and ``down`` are now aliases for ``up-thread`` and
      ``down-thread`` respectively.

    * ``up-thread`` now notifies when a thread becomes empty. This is a step
      towards removing it automatically/prompting to do so.
      (James Westby, #195133)

  BUGFIXES:

    * ``pull`` expects the keywork local. (Mark Lee, #379347)

    * ``setup.py`` doesn't actually install. (Mark Lee, #379069)

    * module has no attribute ``PushResult``. (Robert Collins)

  API BREAKS:

  TESTING:

  INTERNALS:


1.3
===

  IMPROVEMENTS:

    * New command ``export-loom`` allows exporting the loom threads to
      individual branches. (Aaron Bentley)

    * Running loom command on non-loom branches will now give a clean error
      rather than a traceback. (Rob Weir)

    * ``up-thread`` is now significantly faster by using more modern bzrlib
      methods. (Aaron Bentley)

    * ``up-thread`` now accepts merge type parameters such as ``--lca``.
      (Aaron Bentley)