← 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: Joe Julian
  • Date: 2010-01-10 02:25:31 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: joe@julianfamily.org-20100110022531-wqk61rsagz8xsiga
https://launchpad.net/bugs/175839
Added MANIFEST.in to allow bdist_rpm to have all the required include files and tools. bdist_rpm will still fail to build correctly on some distributions due to a disttools bug http://bugs.python.org/issue644744

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