~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Danny van Heumen
  • Date: 2010-03-09 16:38:10 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309163810-ujn8hcx08f75nlf1
Refined test to make use of locking hooks and also validate if lock is truly a checkout-lock.

Show diffs side-by-side

added added

removed removed

Lines of Context:
128
128
~~~~~~~~
129
129
 
130
130
**ancestor**:*path*
131
 
    specifies the common ancestor between the current branch and a
 
131
    specifies the common ancestor between the current branch and a 
132
132
    different branch. This is the same ancestor that would be used for
133
133
    merging purposes.
134
134