/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/es/guia-usuario/index.txt

  • Committer: John Arbash Meinel
  • Date: 2009-06-12 18:05:15 UTC
  • mto: (4371.4.5 vila-better-heads)
  • mto: This revision was merged to the branch mainline in revision 4449.
  • Revision ID: john@arbash-meinel.com-20090612180515-t0cwbjsnve094oik
Add a failing test for handling nodes that are in the same linear chain.

It fails because the ancestry skipping causes us to miss the fact that the two nodes
are actually directly related. We could check at the beginning, as the 
code used to do, but I think that will be incomplete for the more-than-two
heads cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/es/guia-usuario/index.txt
10
10
..   level 3 ~~~~~~~~
11
11
..   level 4 ^^^^^^^^ (it is better not to use nesting deeper than 3 levels)
12
12
 
 
13
.. contents:: :depth: 2
 
14
.. sectnum::
 
15
 
13
16
 
14
17
Introducción
15
18
############
50
53
.. include later - partner_intro.txt
51
54
.. include later - branching_a_project.txt
52
55
.. include later - merging_changes.txt
53
 
.. include later - resolving_conflicts.txt
 
56
.. include:: resolving_conflicts.txt
54
57
.. include later - annotating_changes.txt
55
58
 
56
59
 
100
103
.. include later - server.txt
101
104
.. include later - hooks.txt
102
105
.. include:: version_info.txt
103
 
 
 
106
 
104
107
 
105
108
Apéndice
106
109
########