|
|
21.
|
|
|
Using saved location: %s 
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Using saved location: %s
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:467
|
|
|
22.
|
|
|
Nothing to do.
|
|
|
|
|
Nothing to do.
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:501
|
|
|
23.
|
|
|
Re-base a branch.
|
|
|
|
|
Re-base a branch.
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:41
|
|
|
24.
|
|
|
Rebasing is the process of taking a branch and modifying the history so
that it appears to start from a different point. This can be useful
to clean up the history before submitting your changes. The tree at the
end of the process will be the same as if you had merged the other branch,
but the history will be different. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Rebasing is the process of taking a branch and modifying the history so
that it appears to start from a different point. This can be useful
to clean up the history before submitting your changes. The tree at the
end of the process will be the same as if you had merged the other branch,
but the history will be different. |
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:43
|
|
|
25.
|
|
|
The command takes the location of another branch on to which the branch in
the specified directory (by default, the current working directory)
will be rebased. If a branch is not specified then the parent branch
is used, and this is usually the desired result. |
|
|
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.
|
|
|
|
|
The command takes the location of another branch on to which the branch in
the specified directory (by default, the current working directory)
will be rebased. If a branch is not specified then the parent branch
is used, and this is usually the desired result. |
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:49
|
|
|
26.
|
|
|
The first step identifies the revisions that are in the current branch that
are not in the parent branch. The current branch is then set to be at the
same revision as the target branch, and each revision is replayed on top
of the branch. At the end of the process it will appear as though your
current branch was branched off the current last revision of the target. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
The first step identifies the revisions that are in the current branch that
are not in the parent branch. The current branch is then set to be at the
same revision as the target branch, and each revision is replayed on top
of the branch. At the end of the process it will appear as though your
current branch was branched off the current last revision of the target. |
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:54
|
|
|
27.
|
|
|
Each revision that is replayed may cause conflicts in the tree. If this
happens the command will stop and allow you to fix them up. Resolve the
commits as you would for a merge, and then run 'bzr resolve' to marked
them as resolved. Once you have resolved all the conflicts you should
run 'bzr rebase-continue' to continue the rebase operation. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
Each revision that is replayed may cause conflicts in the tree. If this
happens the command will stop and allow you to fix them up. Resolve the
commits as you would for a merge, and then run 'bzr resolve' to marked
them as resolved. Once you have resolved all the conflicts you should
run 'bzr rebase-continue' to continue the rebase operation. |
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:60
|
|
|
28.
|
|
|
If conflicts are encountered and you decide that you do not wish to continue
you can run 'bzr rebase-abort'. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
If conflicts are encountered and you decide that you do not wish to continue
you can run 'bzr rebase-abort'. |
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:66
|
|
|
29.
|
|
|
The '--onto' option allows you to specify a different revision in the
target branch to start at when replaying the revisions. This means that
you can change the point at which the current branch will appear to be
branched from when the operation completes. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
The '--onto' option allows you to specify a different revision in the
target branch to start at when replaying the revisions. This means that
you can change the point at which the current branch will appear to be
branched from when the operation completes. |
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:69
|
|
|
30.
|
|
|
Show what would be done, but don't actually do anything.
|
|
|
|
|
Show what would be done, but don't actually do anything.
|
|
Translated and reviewed by
Vibhav Pant
|
|
|
|
Located in
commands.py:77
|
