What does SVN import option "reconcile any overlap"
Where can I get a detailed description of the SVN import option "Reconcile with existing: Reconcile any overlap between existing and imported files and folders"? The documentation just says it will "reconcile existing and imported files."
Thanks, Greg |
3 answers
It compares the current state of the target with the initial state being imported and adjust the changes in the first change set in order to make the state of the configuration match the state expected after the first change set being imported. It is useful for preserving the previous history of files but the resulting configuration is not any different then if you imported into an empty component.
|
|
So, is it right that the reconcile option would have no effect in these cases?
- In a workspace based on a branch point baseline created during import of trunk, import that branch. Would there be any reason (performance?) not to enable the option anyway, even when it isn't needed? Also, I'm not clear on what would happen during an import with the reconcile option disabled, if there are changes in the target. For example: 1. import trunk, 2. edit files in the workspace, 3. import trunk again from a newer SVN dump. Are the changes from 2 & 3 merged? We shouldn't have that situation in our imports, since we are doing them into a workspace (and stream) used only for imports, but I want to have a better understanding of the importer. Thank you, Greg |
|
When you are importing from a dump file, the importer will detect if there was a previous import or if you are importing a branch. If you say that you want to continue the import or import a branch, the reconcile bit is disabled by the importer regardless of what you indicated in the wizard.
The importer does not do any merging. If the reconcile option is on, it will overwrite. The main reason to turn off the reconcile is to ensure that you do not import something you didn't expect. That is, if you didn't expect reconciliation to be required, it may be better to have the import fail so you know you selected something wrong (e.g. the wrong starting revision or the wrong folder to import) |
Your answer
Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.