SVN: Release branch and externals? -


We have two websites for one client (main www site and another for e-commerce site which is a separate Sits on the server) Use the shared portion of code (various features / styles / javascript etc) We can currently manage SVNs in different projects (in the same repos), using the shared code and SVN: Extnails to pull each of these two websites into two website projects.

We have just created two release branches, each for each of the two sites, committed to trunk everything for each site when it works normally and when "ready for live" If we merge into the release branch for that site, it works as a behavior other than today, we modified some shared code and saw that the release branch pulled it immediately when we released the release An update on the test. It is not what we wanted to do: (

So with any thought how can we overcome this problem. We use external to share the code, but does anyone else The way? They mention that they are externally bad and we should use a different building process, but there should be no mention of it.

Our crease control .net is running and it is dry Fest Considering a better process?

Cheers

Pete: Update Since: We have been using Mercury (Fogcrual Colon) for our source control since then. The sub-repo is thought of, so we also followed that path along with that project. Even though it comes at a price, the bunting is really difficult because tagging and everything is up to date. Our latest method both project It is a "mega project" that slows down the clone time (check out in SVN), but we do it rarely that it is well worth it to deal with the sub-repo whereas. Now we also facilitate the use of branches instead of feature switching / toggling which makes our development even easier.

If I understand correctly you have something like the following structure:

< Ul>
  • Project 1
    • Trunk
      • Library (via svn: externals library svn: // repo / library
      • release1
          < Li> library
        • Project 2
          • Trunk
            • Library ( Via Svn: external library svn: // repo / library )
          • Branches
            • release1
              • Library (via Svn: External Library svn: // rep
              • If you merge the revision from svn: externals to / project1 / branches / release 1 and on / project 1 / trunk to / library svn: externals If you update the branch, you will automatically get the latest version from the library. By default svn: externals will get the main modification of the link.

                To link to a specific revision, you can define svn: externals , such as: svn: external -r 123 library svn: // repo / Library . This means that the external link will always point to that specific amendment. So when you do not manually change svn: externals manually, you can do this type of svn without ever updating the shared library code. Externals link. / P>

                Perhaps a better way to use the tag for the shared library and link to a specific tag. In this case you will find the following storage structure:

                • Project 1
                  • Trunk
                    • Library (via svn: externals library svn: // repo / Library / Tag / Version3 )
                    • Branches
                      • release1
                        • Library (via svn: externals library Svn: // repo / library /
                        • release2
                          • Library (via svn: externals library svn: // repo / library / tags / version2
                      • Project 2
                        • Trunk
                          • Library ( svn: via external library svn: // repo / library / tags / version2 )
                          • < Li>
                        • Version 1
                        • Version 2
                        • Version 3

    • Comments

    Post a Comment

    Popular posts from this blog

    sql - dynamically varied number of conditions in the 'where' statement using LINQ -

    I am using my first project LINQ (in mvc), so maybe there's something very simple that I remember. However, a day of searching and experimenting does not work, so it works. I am trying to write a LINQ query (Linux to SQL) in which in many cases where the statement is different from an OR or an AND. We do not know how many conditions are going in the query till runtime. This search is for filter control, where the user can choose multiple criteria for filtering. Select from table where table.col = 1 or table.col = 2 or table.col = 7 .... 'Other number of conditions Before I just create the SQL query as a string, while looping over all the situations. However, it seems that there should be a good way to do this in LINQ. I tried to use Expression trees, but they had a second thought for this moment on my head, where the lambda function was to be executed inside the statement such as: values ​​for matchingRows = matchingRows for each value Where (function (row) row.c...
    Read more

    asp.net mvc - Dynamically Generated Ajax.BeginForm -

    I have a problem with ASP.NET MVC Ajax forms. I generate many Ajax form in a table such as: & Lt; Input type = "submit" name = "activity" value = "add activity" / & gt; & Lt;%}% & gt; & Lt; / TD & gt; & Lt; / TR & gt; & Lt;%}% & gt; So far so good. When I post one of those forms, it gives a partial view in a div, and in this new partial view a new Ajax Beginnform (which is not in Genesis form) This second Ajax Beginnorf is exactly like the ones I got on the table, but when I post it, I do not get the "Ajax Post", but a normal post that sends me to a new page, I do not know whether the two Ajax forms What is the reason for the difference between, why is it the "dynamically generated" Ajax form behaves like a normal HTML form? By the way, I know that I can do it in different ways using javascript, but I would like to understand whether it can only be done using MVC helplars and Ajax lib...
    Read more

    Debug on symbian -

    I am using trk for phone debug This works well for the Holorld project But when I start the project in phone debug mode 1) the load failed 2) TrkProtocolPlugin: to target the specified file Failure (please verify If any body understands what problem I am experiencing, then this problem helps me Pre-release If the application has the privileges assigned (with the appropriate certificate) itemprop = "text" > In your case, I will check: / li> If there is no conflict of application ID with any other application of device If there are problematic commands in the installation package (for example copy copy for non-accessible directories)
    Read more