Hello.
The Bitbucket history screenshot is absent for some reason, could you please send it once again? Or event better, could you please collect the history with ‘git log -v’ command? It will give us much more information than just a screenshot.
Could it be possible to provide us ‘git log -v’ command output instead of history screenshot from Bitbucket?
For git log -v, we will have to clone the repositories to our local. Would that work for you?
This also can be done right in the repository on the Bitbucket server, but cloning would work, too. Please run the command for both master and ECD_DF4.6 then.
Apologies, i could not provide the remaining logs earlier as i exceeded the number of replies.
Attaching the log for ECD_DF4.6 now.branch.log (159 Bytes)
Thank you for the logs, we are working to find out what’s happening there.
Hello.
Judging from the logs, the latest history of the branches is OK: the /Data/Archived/Application/ECD4.6 directory has been created by moving /Data/Branches/Application/ECD4.6 in r34817 and have never been changing since then. The /Data/Production/Application/ECD_DF has been created in r29669 and all the changes made to that directory since then are in Git. So, the latest history is present, but the earlier history of those directories is absent, indeed. To get the old history, previous directories names should be added to the mapping configuration, too:
trunk = Data/Production/Application/ECD_DF:refs/heads/master
branches = Data/Archived/Application/ECD4.6/ECD_DF:refs/heads/ECD_DF4.6
branches = Data/Production/Application/ECD_DF_1.0:refs/heads/old_master
branches = Data/Branches/Application/ECD_DF_1.0:refs/heads/oldest_master
branches = Data/Branches/Application/ECD4.6:refs/heads/old_branch
If those paths are not present in the repository at this time, then this mapping will translate the whole history of master and the branch.
Note, that SVN Mirror add-on is able to trace such renamings in SVN history and create an appropriate configuration automatically if ‘Automatic Configuration’ layout is chosen during the add-on configuration.
Thank you. We are trying the new mappings and will update you on the same.
Hi,
We applied the provided mappings, the master branch now has commits from feb 2017 but the other branch ECD_DF4.6 is still showing just one commit. Is it because the paths containing the older history are not present anymore?
Also, we tried the automatic configuration and we are seeing commits in some scattered form. We are validating if that can suffice the requirement.
Thanks
Hi,
When the “automatic” layout is set, the add-on scans the history and creates a mapping configuration trying to add all the needed mappings based on SVN history, so there may be extra mappings that you may not need, but the needed mappings should also be there.
Frankly said, I don’t completely understand what do you mean saying that commits are in scattered form, could you please explain it a little?
To all appearances, the Data/Archived/Application/ECD4.6/ECD_DF SVN directory history has not been translated because there are no revisions in the SVN history that would move that particular directory (ECD_DF) and the add-on is unable to trace its history due to it. A possible workaround for that is to map the whole Data/Archived/Application/ECD4.6 as a branch, not just Data/Archived/Application/ECD4.6/ECD_DF:
trunk = Data/Production/Application/ECD_DF:refs/heads/master
branches = Data/Archived/Application/ECD4.6:refs/heads/ECD_DF4.6
branches = Data/Production/Application/ECD_DF_1.0:refs/heads/old_master
branches = Data/Branches/Application/ECD_DF_1.0:refs/heads/oldest_master
branches = Data/Branches/Application/ECD4.6:refs/heads/old_branch
The history of the branch will be imported then, but the drawback is that the ECD_DF4.6 branch will contain the whole ECD4.6 directory content. A possible workaround for this is to exclude all the unneeded directories and files excepting the ECD_DF, like:
trunk = Data/Production/Application/ECD_DF:refs/heads/master
branches = Data/Archived/Application/ECD4.6:refs/heads/ECD_DF4.6
branches = Data/Production/Application/ECD_DF_1.0:refs/heads/old_master
branches = Data/Branches/Application/ECD_DF_1.0:refs/heads/oldest_master
branches = Data/Branches/Application/ECD4.6:refs/heads/old_branch
excludePath = /<unneeded directory1>
excludePath = /<unneeded directory2>
excludePath = /<unneeded file1>
…
But the drawback here is that the excludePath and includePath settings are being applied to all branches and tags and to trunk, too, so the directories and files will be excluded in the master branch, too, if there are directories with the same names.
Hi,
Thank you for the suggestions.
We are validating it and will get back to you on this.
Thanks