Conversation
jennyhickson
left a comment
jennyhickson
left a comment
There was a problem hiding this comment.
Thanks for working out a new process. A couple of questions...
| commit on git - tags will have the same name on both, revisions of specific | ||
| commits will need to be manually aligned with a commit hash by comparing | ||
| commit messages. | ||
| The process below involves rsyncing the changes in your fcm working copy to |
There was a problem hiding this comment.
I think its still good to have some words about the git_migration tag and others - maybe in a tip underneath this important box?
There was a problem hiding this comment.
Not sure I read the entirety of the tip box correctly. I've added that stuff back in
| #. Create a patch file from your new branch at the migration point. To do this | ||
| you will need to know the branch point of your fcm branch, which can be found | ||
| from the ``fcm binfo`` command | ||
| #. Get an export of the branch you wish to migrate (the one above in this case). |
There was a problem hiding this comment.
Curious as to why an export not a checkout? Particularly if you then delete the .svn directory doesn't that make them basically the same?
There was a problem hiding this comment.
Thinking about it we can probably just exclude the .svn dir below as well. Removed this step and added that there
james-bruten-mo
left a comment
james-bruten-mo
left a comment
There was a problem hiding this comment.
Thanks Jenny, triggered a few changes
| commit on git - tags will have the same name on both, revisions of specific | ||
| commits will need to be manually aligned with a commit hash by comparing | ||
| commit messages. | ||
| The process below involves rsyncing the changes in your fcm working copy to |
There was a problem hiding this comment.
Not sure I read the entirety of the tip box correctly. I've added that stuff back in
| #. Create a patch file from your new branch at the migration point. To do this | ||
| you will need to know the branch point of your fcm branch, which can be found | ||
| from the ``fcm binfo`` command | ||
| #. Get an export of the branch you wish to migrate (the one above in this case). |
There was a problem hiding this comment.
Thinking about it we can probably just exclude the .svn dir below as well. Removed this step and added that there
jennyhickson
left a comment
jennyhickson
left a comment
There was a problem hiding this comment.
Thanks. One last thing...
|
|
||
| .. important:: | ||
|
|
||
| For convenience, the ``git_migration`` tag is provided as a branch point in |
There was a problem hiding this comment.
Please can you swap the paragraph order on these two? What is currently the second paragraph gives the more important detail - the rest is supporting information.
There was a problem hiding this comment.
No problem :)
2 participants
The patch method of migrating branches has been hitting issues around new files in new directories.
I can't work out a way to do this, so instead we're suggesting that we use rsync instead. If branches are created from an equivalent point, this should result in the same outcome as previously.