Welcome to Team System Rocks Sign in | Join | Help
in
Home Blogs Forums Photos Tutorials Files Roller
Notion Solutions Main Site

Solution file Should be part of merge or not? Please Help..!!

Last post 08-12-2008, 8:20 AM by Anand.Manra. 0 replies.
Sort Posts: Previous
  •  08-12-2008, 8:20 AM

    Solution file Should be part of merge or not? Please Help..!!

    Hi All,  I have the following Structure of the project.

    Testproject
                Main
                         Scripts
                         Sources
                         Desktop Modules


                Development                              <--(Solution file location)
                         Main-Branch                    <--(Branch from Main) 
                                  Scripts
                                  Sources
                                  Desktop Modules
               Release                                    <--(Branched from Main)
                                  Scripts
                                  Sources
                                  Deskktop Modules

    In this Project Structure i am keeping the Solution file under Development Folder , and wht we do is every developer creates it own branch from the Main-Branch under Development Eg:-

    Development                              <--(Solution file location)
                Main-Branch                    <--(Branch from Main) 
                         Scripts
                         Sources
                         Desktop Modules

    Developer1                       <--(Branch from Main-Branch) 
               Scripts
               Sources
               Desktop Modules

    so after creating a branch developer works under his/her branch (checksout, checks-in the code) and when developers are done with there work they merge back their own branch into Main-Branch and CI Triggers everytime they check in.

    Now as i am keeping solution file under development folder solution file does not goes to a developer branch. So How developers will be able to add there projects in the solution file.


    (wht i think, developers will work in there own solution files and run the code and compile it. they wont do anything in solution file which is in repository. and they are only going to check-in the projects in there own branches when they r done and merge back to the Main-Branch. and later build engg will add those projects in the solution file which is in Development Folder)

    But only problem i am facing in this method is, As the "Main-Branch" is a part of Continuos Integration a moment any developers merges back his/her Project from there branch to this branch and checks in, its going to trigger the CI. Now ofcourse the project files will be a part of the Branch as a changeset, But its not going to be part of Solution. So its not going to be actually build, even though it will be pulled down to a build machine, but just like a copy not as a part of solution.

    So then Later on again Someone has to add the project in the solution and check in , which will trigger the CI again and this time it will be part of Solution.?

    Any Comments, Better way? How this can be achieved.....

View as RSS news feed in XML
Powered by Community Server, by Telligent Systems