|
471.
|
|
|
Print just the version number.
|
|
|
|
Solamente imprime el número de versión.
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4187
|
|
472.
|
|
|
It sure does!
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
¡Seguro que si!
|
|
Translated and reviewed by
Jelmer Vernooij
|
|
|
|
Located in
bzrlib/builtins.py:4206
|
|
473.
|
|
|
merge base is revision %s
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
la base de combinación es la revisión %s
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4230
|
|
474.
|
|
|
Perform a three-way merge.
|
|
|
|
Realiza una fusión de tres vías.
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4234
|
|
475.
|
|
|
The source of the merge can be specified either in the form of a branch, ![](/@@/translation-newline)
or in the form of a path to a file containing a merge directive generated ![](/@@/translation-newline)
with bzr send. If neither is specified, the default is the upstream branch ![](/@@/translation-newline)
or the branch most recently merged using --remember. The source of the ![](/@@/translation-newline)
merge may also be specified in the form of a path to a file in another ![](/@@/translation-newline)
branch: in this case, only the modifications to that file are merged into ![](/@@/translation-newline)
the current working tree.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
In Ubuntu: |
|
El origen de la fusión puede ser especificado en forma de una rama, ![](/@@/translation-newline)
o en forma de una ruta a un archivo que contenga una directiva de fusión ![](/@@/translation-newline)
generada con «bzr send». Si ninguna de ellas es especificada, por defecto es la ![](/@@/translation-newline)
rama principal o la rama que haya sido fusionada más recientemente usando --remember. El código ![](/@@/translation-newline)
de la fusión debe ser también especificado en forma de una ruta a archivo en otra ![](/@@/translation-newline)
rama: si es este caso, solo las modificaciones a ese archivo serán fusionadas con el ![](/@@/translation-newline)
árbol de trabajo actual.
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4236
|
|
476.
|
|
|
When merging from a branch, by default bzr will try to merge in all new ![](/@@/translation-newline)
work from the other branch, automatically determining an appropriate base ![](/@@/translation-newline)
revision. If this fails, you may need to give an explicit base.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
In Ubuntu: |
|
Cuando se fusione desde una rama, por defecto bzr probará a mezclar todo el nuevo ![](/@@/translation-newline)
trabajo desde otra rama, determinando automáticamente una base de revisión ![](/@@/translation-newline)
apropiada. Si esto falla, puede que necesite dar una base explícita.
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4244
|
|
477.
|
|
|
To pick a different ending revision, pass "--revision OTHER". bzr will ![](/@@/translation-newline)
try to merge in all new work up to and including revision OTHER.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
In Ubuntu: |
|
Para escoger una revisión final diferente, ejecute «--revision OTRA». bzr ![](/@@/translation-newline)
probará a fusionar todo el nuevo trabajo e incluirá la revisión OTRA
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4248
|
|
478.
|
|
|
If you specify two values, "--revision BASE..OTHER", only revisions BASE ![](/@@/translation-newline)
through OTHER, excluding BASE but including OTHER, will be merged. If this ![](/@@/translation-newline)
causes some revisions to be skipped, i.e. if the destination branch does ![](/@@/translation-newline)
not already contain revision BASE, such a merge is commonly referred to as ![](/@@/translation-newline)
a "cherrypick". Unlike a normal merge, Bazaar does not currently track ![](/@@/translation-newline)
cherrypicks. The changes look like a normal commit, and the history of the ![](/@@/translation-newline)
changes from the other branch is not stored in the commit.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4251
|
|
479.
|
|
|
Revision numbers are always relative to the source branch.
|
|
|
|
Los números de revisión están siempre relacionados con la rama origen.
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4259
|
|
480.
|
|
|
Merge will do its best to combine the changes in two branches, but there ![](/@@/translation-newline)
are some kinds of problems only a human can fix. When it encounters those, ![](/@@/translation-newline)
it will mark a conflict. A conflict means that you need to fix something, ![](/@@/translation-newline)
before you can commit.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
In Ubuntu: |
|
Merge (fusionar) hará lo mejor posible para combinar los cambios en dos ramas, pero ![](/@@/translation-newline)
hay algunos problemas que sólo un humano puede arreglar. Cuando los encuentre, ![](/@@/translation-newline)
se marcará como un conflicto. Un conflicto significa que necesitas arreglar algo ![](/@@/translation-newline)
antes de que puedas hacer un «commit».
|
|
|
Suggested by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
|