← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/formats.txt

  • Committer: Martin Pool
  • Date: 2005-07-11 07:05:34 UTC
  • Revision ID: mbp@sourcefrog.net-20050711070534-5227696ab167ccde
- merge aaron's append_multiple.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/formats.txt
98
98
  include merges add to this file; lines are never removed or
99
99
  reordered.
100
100
 
101
 
``pending-merge-patches``
102
 
  List of foreign patches that have been merged and are waiting to be
103
 
  committed. 
 
101
``pending-merges`` 
 
102
  List (one per line) of non-mainline revisions that
 
103
  have been merged and are waiting to be committed.
104
104
 
105
105
``branch-name``
106
106
  User-qualified name of the branch, for the purpose of describing the
174
174
An inventory is stored for recorded revisions, also a
175
175
``pending-inventory`` for a working directory.
176
176
 
 
177
Inventories always have the same id as the revision they correspond
 
178
to.  bzr up to 0.0.5 explicitly stores an inventory-id; in future
 
179
versions this may be implied.
 
180
 
177
181
 
178
182
 
179
183
Revision