|
|
478.
|
|
|
If you specify two values, "--revision BASE..OTHER", only revisions BASE 
through OTHER, excluding BASE but including OTHER, will be merged. If this
causes some revisions to be skipped, i.e. if the destination branch does
not already contain revision BASE, such a merge is commonly referred to as
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
cherrypicks. The changes look like a normal commit, and the history of the
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
are some kinds of problems only a human can fix. When it encounters those,
it will mark a conflict. A conflict means that you need to fix something,
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
hay algunos problemas que sólo un humano puede arreglar. Cuando los encuentre,
se marcará como un conflicto. Un conflicto significa que necesitas arreglar algo
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
|
|
|
481.
|
|
|
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
|
|
|
|
|
Use bzr resolve cuando tenga un problema arreglado. Vea también bzr conflicts.
|
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4266
|
|
|
482.
|
|
|
If there is no default branch set, the first merge will set it (use
--no-remember to avoid setting it). After that, you can omit the branch
to use the default. To change the default, use --remember. The value will
only be saved if the remote location can be accessed. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
| In Ubuntu: |
|
Si no hay ubicación predeterminada establecida, la primera vez que se combine
se establecerá (use --no-remember para evitarlo). Después puede omitir la
ubicación para usar la predeterminada. Para cambiarla, use --remember. El
valor solo se guardará si la ubicación remota es accesible. |
|
|
Suggested by
Jose Luis Tirado
|
|
|
|
Located in
bzrlib/builtins.py:4268
|
|
|
483.
|
|
|
The results of the merge are placed into the destination working
directory, where they can be reviewed (with bzr diff), tested, and then
committed to record the result of the merge. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4273
|
|
|
484.
|
|
|
merge refuses to run if there are any uncommitted changes, unless
--force is given. If --force is given, then the changes from the source
will be merged with the current working tree, including any uncommitted
changes in the tree. The --force option can also be used to create a
merge revision which has more than two parents. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4277
|
|
|
485.
|
|
|
If one would like to merge changes from the working tree of the other
branch without merging any committed revisions, the --uncommitted option
can be given. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
bzrlib/builtins.py:4283
|
|
|
486.
|
|
|
To select only some changes to merge, use "merge -i", which will prompt
you to apply each diff hunk and file change, similar to "shelve". |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
| In Ubuntu: |
|
Para seleccionar únicamente algunos cambios a combinar, use «merge -i», lo que
le preguntará para aplicar cada grupo de diferencias y cambio de archivo, de
forma similar a «shelve». |
|
|
Suggested by
Jose Luis Tirado
|
|
|
|
Located in
bzrlib/builtins.py:4287
|
|
|
487.
|
|
|
:Examples:
To merge all new revisions from bzr.dev:: |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
:Ejemplos:
Para fusionar todas las revisiones nuevas de bzr.dev:: |
|
Translated and reviewed by
Paco Molinero
|
|
|
|
Located in
bzrlib/builtins.py:4290
|
