Hi all, I recently got a contract to rewrite a large (web) application. The intent is to transition, at a measured pace, from a large collection of hand-written, framework-free php files to a structured setup with a nice MVC framework, etc.
So far so good. I've got all the original source in a fossil repo and it has a pretty rich history as I've been maintaining this system for the last year or so. Moving this to the framework I've chosen will involve, up front, moving every single one of the exisiting source files to a new location deeper in the project hierarchy. The files will then be slowly replaced as their functionality is added to the new system in the appropriate place. I'd love to be able to do this project with hotfixes continuing on trunk as the deployed version evolves and having all of the restructuring take place on a super massive "v2" branch, but I'm anticipating a few problems: * Merging updates from trunk to v2 -- cherrypick isn't going to work very well when the names don't match anymore, is it? * What should I expect after I've deleted a file on v2 (having replaced its functionality) and then merge back some updates from trunk containing a change to that file? Just a plain old merge conflict or should I expect and watch for the file to reappear on the branch after being previously deleted? * Anything else you can foresee? Has anyone out there tried a complete project restructuring on a branch with any success, or is the default workflow to just spin up another repo and synchronize changes by hand? Any other thoughts or input? Thanks, Themba _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
