Bazaar #728
Merged
Bazaar #728
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jnavila
reviewed
Mar 6, 2017
|
|
||
| At this point, the way to import a Bazaar repository differs according to that you have a single branch or you are working with a repository that has several branches. | ||
|
|
||
|
|
|
|
||
| Your working copy is still unsynchronized, so let's reset it: | ||
|
|
||
| ===== Synchronize the staging area |
There was a problem hiding this comment.
Better use the "v-ing" form in titles
|
|
||
| ===== Synchronize the staging area | ||
|
|
||
| Whatever the number of branches you had and the import method you used, your staging area is not synchronized with HEAD, and with the import of several branches, your working directory is not synchronized neither. |
| Now let us have a look at the files to ignore. | ||
| As `.bzrignore`'s format is completely compatible with `.gitignore`'s format, the simplest is to rename your `.bzrignore` file. | ||
| You will also have to create a commit that contains this change for the migration: | ||
| [source,console] |
|
|
||
| ===== Ignore the files that were ignored with .bzrignore | ||
|
|
||
| Now let us have a look at the files to ignore. |
| ---- | ||
|
|
||
|
|
||
| ===== Ignore the files that were ignored with .bzrignore |
|
LGTM. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It was necessary to rewrite the section about importing a Bazaar repository into a Git repository because some operations were common regardless the user imports one or several branches.
I hope it is more clear now.