[Pkg-bazaar-commits] ./bzr/unstable r693: - notes on tracking multiple parents

[Martin Pool]

------------------------------------------------------------
revno: 693
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-06-15 19:24:48 +1000
message:
  - notes on tracking multiple parents
modified:
  doc/formats.txt
-------------- next part --------------
=== modified file 'doc/formats.txt'
--- a/doc/formats.txt	2005-04-15 01:31:21 +0000
+++ b/doc/formats.txt	2005-06-15 09:24:48 +0000
@@ -191,10 +191,6 @@
 timestamp
   As floating-point seconds since epoch.
 
-precursor
-  ID of the previous revision on this branch.  May be absent (null) if
-  this is the start of a new branch.
-
 branch name
   Name of the branch to which this was originally committed.    
 
@@ -205,6 +201,17 @@
 inventory_hash
   Acts as a pointer to the inventory for this revision.
 
+parents
+  Zero, one, or more references to parent revisions.   For each 
+  the revision-id and the revision file's hash are given.  The first
+  parent is by convention the revision in whose working tree the
+  new revision was created.
+
+precursor
+  Must be equal to the first parent, if any are given.  For
+  compatibility with bzr 0.0.5 and earlier; eventually will be
+  removed. 
+
 merged-branches
   Revision ids of complete branches merged into this revision.  If a
   revision is listed, that revision and transitively its predecessor