← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/specifying_revisions.txt

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/specifying_revisions.txt
36
36
 +----------------------+------------------------------------+
37
37
 | *number*             | revision number                    |
38
38
 +----------------------+------------------------------------+
39
 
 | **revno**:*number*   | positive revision number           |
 
39
 | **revno**:*number*   | revision number                    |
40
40
 +----------------------+------------------------------------+
41
41
 | **last**:*number*    | negative revision number           |
42
42
 +----------------------+------------------------------------+
 
43
 | *guid*               | globally unique revision id        |
 
44
 +----------------------+------------------------------------+
43
45
 | **revid**:*guid*     | globally unique revision id        |
44
46
 +----------------------+------------------------------------+
45
47
 | **before**:*rev*     | leftmost parent of ''rev''         |
46
48
 +----------------------+------------------------------------+
47
 
 | **date**:*value*     | first entry after a given date     |
48
 
 +----------------------+------------------------------------+
49
 
 | **tag**:*value*      | revision matching a given tag      |
 
49
 | *date-value*         | first entry after a given date     |
 
50
 +----------------------+------------------------------------+
 
51
 | **date**:*date-value*| first entry after a given date     |
 
52
 +----------------------+------------------------------------+
 
53
 | *tag-name*           | revision matching a given tag      |
 
54
 +----------------------+------------------------------------+
 
55
 | **tag**:*tag-name*   | revision matching a given tag      |
50
56
 +----------------------+------------------------------------+
51
57
 | **ancestor**:*path*  | last merged revision from a branch |
52
58
 +----------------------+------------------------------------+
81
87
~~~~~
82
88
 
83
89
**revid** allows specifying a an internal revision ID, as shown by ``bzr
84
 
log`` and some other commands.
 
90
log --show-ids`` and some other commands.
85
91
 
86
92
For example::
87
93
 
128
134
~~~~~~~~
129
135
 
130
136
**ancestor**:*path*
131
 
    specifies the common ancestor between the current branch and a 
 
137
    specifies the common ancestor between the current branch and a
132
138
    different branch. This is the same ancestor that would be used for
133
139
    merging purposes.
134
140