Skip to content
  • Categories
  • Recent
  • Tags
  • Popular
  • World
  • Users
  • Groups
Skins
  • Light
  • Cerulean
  • Cosmo
  • Flatly
  • Journal
  • Litera
  • Lumen
  • Lux
  • Materia
  • Minty
  • Morph
  • Pulse
  • Sandstone
  • Simplex
  • Sketchy
  • Spacelab
  • United
  • Yeti
  • Zephyr
  • Dark
  • Cyborg
  • Darkly
  • Quartz
  • Slate
  • Solar
  • Superhero
  • Vapor

  • Default (No Skin)
  • No Skin
Collapse
Code Project
  1. Home
  2. The Lounge
  3. Source Control with Branching and VS support?

Source Control with Branching and VS support?

Scheduled Pinned Locked Moved The Lounge
collaborationvisual-studiotoolsquestionlearning
46 Posts 36 Posters 35 Views 1 Watching
  • Oldest to Newest
  • Newest to Oldest
  • Most Votes
Reply
  • Reply as topic
Log in to reply
This topic has been deleted. Only users with topic management privileges can see it.
  • C Che Mass

    Does anyone know of a good source control that has/is: >Branching and Merging >Shallow learning curve >speedy >Good windows tools OR a worthwhile VS plugin I'm looking at subversion (ok, but seems slow), Team foundation (too much - and HOW MUCH???) & Git, but i don't know enough! At the moment we are using the flagship of the microsoft line - SourceSafe! It's fine for most of our little one-man web projects, but for multi-dev use? erm..... No. We're currently working on a project that is different on production, staging and dev. Different bits are added at different times, some things are pushed to production, some things not.... blergh! So, i need a good, easy to use, source control with branching/merging. Over to you....

    J Offline
    J Offline
    Jean De Spaey
    wrote on last edited by
    #16

    In our company we are using both ClearCase (base) and Perforce. ClearCase is a super system but requires expertise to manage it and it is expensive. Mac support is limited (through Eclipse plugin) It allows versioning of folders too which Perforce is not able to do. A product I evaluated in the past is Plastic SCM (codice) which has all the goodies of Clearcase and Perforce (and many others); it is also much cheaper than ClearCase. Check "www.plasticscm.com". It runs on Windows, Linux and Mac OS/X

    1 Reply Last reply
    0
    • G Gary R Wheeler

      We use VSS as well. We eventually wrote our own branch application. It branches all of the files in a project tree, replicates shares within the tree, and fixes up the ProjectGUID's in the project files and links up the solutions to the projects in the branch correctly. It's sort of an 'XCOPY' for VSS.

      Software Zen: delete this;
      Fold With Us![^]

      I Offline
      I Offline
      ian__lindsay 0
      wrote on last edited by
      #17

      We have used VSS for about 10 years - we had some horrible thing called PVCS before that. It has its quirks and it works better if the source database is regularly pruned, but for us - a dev team of 5 - it does the job. It got a whole lot easier when Visual Studio brought in the 'change source control' functionality (about 2003/2005, can't remember exactly). It was manual editing of the project file after a branch before that! I guess we really ought to investigate the alternatives, but we are fairly happy with what we have, and there are other priorities...

      J 1 Reply Last reply
      0
      • C Che Mass

        Does anyone know of a good source control that has/is: >Branching and Merging >Shallow learning curve >speedy >Good windows tools OR a worthwhile VS plugin I'm looking at subversion (ok, but seems slow), Team foundation (too much - and HOW MUCH???) & Git, but i don't know enough! At the moment we are using the flagship of the microsoft line - SourceSafe! It's fine for most of our little one-man web projects, but for multi-dev use? erm..... No. We're currently working on a project that is different on production, staging and dev. Different bits are added at different times, some things are pushed to production, some things not.... blergh! So, i need a good, easy to use, source control with branching/merging. Over to you....

        H Offline
        H Offline
        hubey
        wrote on last edited by
        #18

        Team Foundation Server has a workgroup edition which works out much less expensive for small shops (up to 5 users). You don't even pay for it as a product in its own right - it's included in the VS Team Dev licence. I was told (by a Microsoft VAR) that the minimum setup is one VS Team Dev licence and the remaining four can be VS Pro plus Foundation Server CALs. The gotcha is the 5-user limit - more users and you will need the full product.

        1 Reply Last reply
        0
        • C Che Mass

          Does anyone know of a good source control that has/is: >Branching and Merging >Shallow learning curve >speedy >Good windows tools OR a worthwhile VS plugin I'm looking at subversion (ok, but seems slow), Team foundation (too much - and HOW MUCH???) & Git, but i don't know enough! At the moment we are using the flagship of the microsoft line - SourceSafe! It's fine for most of our little one-man web projects, but for multi-dev use? erm..... No. We're currently working on a project that is different on production, staging and dev. Different bits are added at different times, some things are pushed to production, some things not.... blergh! So, i need a good, easy to use, source control with branching/merging. Over to you....

          M Offline
          M Offline
          Member 4593559
          wrote on last edited by
          #19

          Hi, We are using Synergy by telelogic atm. been using it for the past 4 years now, and although initially it was a pain in the backside, now I have Build Manager rights :D, I am a lot happier using it! It does branching and Merging pretty well, but its a steep learning curve, not quick(at least not if you have mammoth projects), the GUI is horrendous, and integration with VS could be better. Oh and apparently it is expensive for licenses. Apart from that though, it might be worth a look!

          C 1 Reply Last reply
          0
          • M Member 4593559

            Hi, We are using Synergy by telelogic atm. been using it for the past 4 years now, and although initially it was a pain in the backside, now I have Build Manager rights :D, I am a lot happier using it! It does branching and Merging pretty well, but its a steep learning curve, not quick(at least not if you have mammoth projects), the GUI is horrendous, and integration with VS could be better. Oh and apparently it is expensive for licenses. Apart from that though, it might be worth a look!

            C Offline
            C Offline
            Che Mass
            wrote on last edited by
            #20

            Hmmmm.... I think i may skip that one!

            1 Reply Last reply
            0
            • C Che Mass

              Does anyone know of a good source control that has/is: >Branching and Merging >Shallow learning curve >speedy >Good windows tools OR a worthwhile VS plugin I'm looking at subversion (ok, but seems slow), Team foundation (too much - and HOW MUCH???) & Git, but i don't know enough! At the moment we are using the flagship of the microsoft line - SourceSafe! It's fine for most of our little one-man web projects, but for multi-dev use? erm..... No. We're currently working on a project that is different on production, staging and dev. Different bits are added at different times, some things are pushed to production, some things not.... blergh! So, i need a good, easy to use, source control with branching/merging. Over to you....

              C Offline
              C Offline
              Che Mass
              wrote on last edited by
              #21

              Thanks for all of the comments. For the moment, it looks like we'll go with the SVN / TortoiseSVN route. If we need to then we'll probably get the VisualSVN client, but in these economic climates.....Maybe we'll just stick with the tortoise! Cheers again!

              B 1 Reply Last reply
              0
              • L Lost User

                VisualSVN + AnkhSVN + TortoiseSVN.

                B Offline
                B Offline
                Brad Stiles
                wrote on last edited by
                #22

                Rob Caldecott wrote:

                VisualSVN + AnkhSVN + TortoiseSVN.

                +1 on that recommendation. That's our combination. We host the Subversion repositories on Linux/Apache, which mitigates the speed issue somewhat. The biggest slowdown for us is network bandwidth when communication with the repository is required.

                1 Reply Last reply
                0
                • C Che Mass

                  Thanks for all of the comments. For the moment, it looks like we'll go with the SVN / TortoiseSVN route. If we need to then we'll probably get the VisualSVN client, but in these economic climates.....Maybe we'll just stick with the tortoise! Cheers again!

                  B Offline
                  B Offline
                  Brad Stiles
                  wrote on last edited by
                  #23

                  Che Mass wrote:

                  If we need to then we'll probably get the VisualSVN client, but in these economic climates.....Maybe we'll just stick with the tortoise!

                  We've found that TortoiseSVN will handle about 95% of what we want to do on a daily basis. Where a VS plugin (AnkhSVN, VisualSVN) helps greatly is when you need to rename or move stuff in your project. Using TSVN alone, you have to either do the rename/move in Windows Explorer, and then adjust your Visual Studio project, or do it in Visual Studio and then try to figure out how to make TSVN view it as a move instead of a delete and add of a brand new file. Using the plug-in (we use AnkhSVN because it's open-source and free, but VisualSVN is based on TortoiseSVN), it's a matter of simply doing the move/rename in the Visual Studio Solution Explorer.

                  M 1 Reply Last reply
                  0
                  • C Che Mass

                    Does anyone know of a good source control that has/is: >Branching and Merging >Shallow learning curve >speedy >Good windows tools OR a worthwhile VS plugin I'm looking at subversion (ok, but seems slow), Team foundation (too much - and HOW MUCH???) & Git, but i don't know enough! At the moment we are using the flagship of the microsoft line - SourceSafe! It's fine for most of our little one-man web projects, but for multi-dev use? erm..... No. We're currently working on a project that is different on production, staging and dev. Different bits are added at different times, some things are pushed to production, some things not.... blergh! So, i need a good, easy to use, source control with branching/merging. Over to you....

                    D Offline
                    D Offline
                    DetroitJ
                    wrote on last edited by
                    #24

                    We have a team of 6 devs and we are using SourceGear Fortress. Fortress takes Vault and adds work item tracking and build server integration. One of our devs has used many other systems; Clear Case, CVS, Subversion, and TFS and he believes SourceGear is the best. I implemented SCM at our company and through my many evals, SourceGear had the easiest product to install, configure and manage. It was also the least expensive commercial option. We have had a couple of minor issues but support was very helpful. They provide a good SDK and API to write custom tools for builds and various management operations.

                    1 Reply Last reply
                    0
                    • B Brad Stiles

                      Che Mass wrote:

                      If we need to then we'll probably get the VisualSVN client, but in these economic climates.....Maybe we'll just stick with the tortoise!

                      We've found that TortoiseSVN will handle about 95% of what we want to do on a daily basis. Where a VS plugin (AnkhSVN, VisualSVN) helps greatly is when you need to rename or move stuff in your project. Using TSVN alone, you have to either do the rename/move in Windows Explorer, and then adjust your Visual Studio project, or do it in Visual Studio and then try to figure out how to make TSVN view it as a move instead of a delete and add of a brand new file. Using the plug-in (we use AnkhSVN because it's open-source and free, but VisualSVN is based on TortoiseSVN), it's a matter of simply doing the move/rename in the Visual Studio Solution Explorer.

                      M Offline
                      M Offline
                      moongarden
                      wrote on last edited by
                      #25

                      Can anyone suggest a good write-up/tutorial on SVN with VS? Cheers Terry

                      F S 2 Replies Last reply
                      0
                      • C Che Mass

                        Does anyone know of a good source control that has/is: >Branching and Merging >Shallow learning curve >speedy >Good windows tools OR a worthwhile VS plugin I'm looking at subversion (ok, but seems slow), Team foundation (too much - and HOW MUCH???) & Git, but i don't know enough! At the moment we are using the flagship of the microsoft line - SourceSafe! It's fine for most of our little one-man web projects, but for multi-dev use? erm..... No. We're currently working on a project that is different on production, staging and dev. Different bits are added at different times, some things are pushed to production, some things not.... blergh! So, i need a good, easy to use, source control with branching/merging. Over to you....

                        F Offline
                        F Offline
                        Fabio Franco
                        wrote on last edited by
                        #26

                        Definitely subversion and TortoiseSVN. No issue with performance and these are full-featured free solutions. Also there is AnkhSVN (I'm using v2.0) which is a VS integration plugin. It is easy to use and I never had any issue with it, and it is not really necessary, TortoiseSVN does a good job by itself. The learning curve of TortoiseSVN is really short. Here is an article that demonstrates that: Getting started with Subversion - Peter's Gekko[^] I hope this helps. Regards, Fábio

                        1 Reply Last reply
                        0
                        • M moongarden

                          Can anyone suggest a good write-up/tutorial on SVN with VS? Cheers Terry

                          F Offline
                          F Offline
                          Fabio Franco
                          wrote on last edited by
                          #27

                          Here: Getting started with Subversion - Peter's Gekko[^] I hope this helps. Regards, Fábio

                          1 Reply Last reply
                          0
                          • C Che Mass

                            Does anyone know of a good source control that has/is: >Branching and Merging >Shallow learning curve >speedy >Good windows tools OR a worthwhile VS plugin I'm looking at subversion (ok, but seems slow), Team foundation (too much - and HOW MUCH???) & Git, but i don't know enough! At the moment we are using the flagship of the microsoft line - SourceSafe! It's fine for most of our little one-man web projects, but for multi-dev use? erm..... No. We're currently working on a project that is different on production, staging and dev. Different bits are added at different times, some things are pushed to production, some things not.... blergh! So, i need a good, easy to use, source control with branching/merging. Over to you....

                            M Offline
                            M Offline
                            Member 3730942
                            wrote on last edited by
                            #28

                            SourceGear Vault. Zero learning curve. Great VS Studio plug-in. SQL Server repository for your code. Includes tool to import your existing Visual Source Safe database. Free single user license. Good price for additional users. Overall bullet-proof.

                            1 Reply Last reply
                            0
                            • S Sandeep Datta

                              Che Mass wrote:

                              Team foundation (too much - and HOW MUCH???)

                              Of all the suggested alternatives VSTS (Visual studio team system) is probably the most hassle free, feature complete (and probably most expensive too). I have been using it for quite some time now (in a team of 4 to 6 devs) and it has been smooth sailing ever since. Support for Branching and merging is excellent too. My favourite feature in VSTS is the ability to shelve what you are doing now and start working from scratch with the version on the source control without losing the current changes (hope this makes sense). Cheers, SDX2000.

                              The best way to accelerate a Macintosh is at 9.8m/sec-sec - Marcus Dolengo

                              G Offline
                              G Offline
                              ghard68
                              wrote on last edited by
                              #29

                              I've also heared about this new Shelving feature, and I see it's really something I would regulary use. But where is the difference between - Putting something "on shelve" - Putting it in an new branch. Is it just the benefit, nobody else sees my shelve ? Or minor adminstativ overhead?

                              S S 2 Replies Last reply
                              0
                              • L Lost User

                                VisualSVN + AnkhSVN + TortoiseSVN.

                                T Offline
                                T Offline
                                Tim Friesen
                                wrote on last edited by
                                #30

                                Here Here!!!

                                Tim Friesen

                                1 Reply Last reply
                                0
                                • I ian__lindsay 0

                                  We have used VSS for about 10 years - we had some horrible thing called PVCS before that. It has its quirks and it works better if the source database is regularly pruned, but for us - a dev team of 5 - it does the job. It got a whole lot easier when Visual Studio brought in the 'change source control' functionality (about 2003/2005, can't remember exactly). It was manual editing of the project file after a branch before that! I guess we really ought to investigate the alternatives, but we are fairly happy with what we have, and there are other priorities...

                                  J Offline
                                  J Offline
                                  jsrjsr
                                  wrote on last edited by
                                  #31

                                  A number of our developers were using PVCS. Now they've been pushed to use ClearCase. Most of them liked PVCS better -- although I think it's mostly that they were very used to it.

                                  J 1 Reply Last reply
                                  0
                                  • C Che Mass

                                    Does anyone know of a good source control that has/is: >Branching and Merging >Shallow learning curve >speedy >Good windows tools OR a worthwhile VS plugin I'm looking at subversion (ok, but seems slow), Team foundation (too much - and HOW MUCH???) & Git, but i don't know enough! At the moment we are using the flagship of the microsoft line - SourceSafe! It's fine for most of our little one-man web projects, but for multi-dev use? erm..... No. We're currently working on a project that is different on production, staging and dev. Different bits are added at different times, some things are pushed to production, some things not.... blergh! So, i need a good, easy to use, source control with branching/merging. Over to you....

                                    M Offline
                                    M Offline
                                    Matt Michielsen
                                    wrote on last edited by
                                    #32

                                    I'm in the process of switching from subversion to Mercurial (http://www.selenic.com/mercurial/wiki/) and am liking it quite a bit so far. Plus, the Tortoise client for Windows is almost exactly the same for both.

                                    1 Reply Last reply
                                    0
                                    • C Che Mass

                                      Does anyone know of a good source control that has/is: >Branching and Merging >Shallow learning curve >speedy >Good windows tools OR a worthwhile VS plugin I'm looking at subversion (ok, but seems slow), Team foundation (too much - and HOW MUCH???) & Git, but i don't know enough! At the moment we are using the flagship of the microsoft line - SourceSafe! It's fine for most of our little one-man web projects, but for multi-dev use? erm..... No. We're currently working on a project that is different on production, staging and dev. Different bits are added at different times, some things are pushed to production, some things not.... blergh! So, i need a good, easy to use, source control with branching/merging. Over to you....

                                      J Offline
                                      J Offline
                                      Jason Christian
                                      wrote on last edited by
                                      #33

                                      We are using Accurev - branching/merging are a piece of cake, and it works well with multiple devs. Pretty shallow learning curve for devs - a little more for Admin (some of the functions are tricky to find in the GUI).

                                      1 Reply Last reply
                                      0
                                      • C Che Mass

                                        Does anyone know of a good source control that has/is: >Branching and Merging >Shallow learning curve >speedy >Good windows tools OR a worthwhile VS plugin I'm looking at subversion (ok, but seems slow), Team foundation (too much - and HOW MUCH???) & Git, but i don't know enough! At the moment we are using the flagship of the microsoft line - SourceSafe! It's fine for most of our little one-man web projects, but for multi-dev use? erm..... No. We're currently working on a project that is different on production, staging and dev. Different bits are added at different times, some things are pushed to production, some things not.... blergh! So, i need a good, easy to use, source control with branching/merging. Over to you....

                                        A Offline
                                        A Offline
                                        Arjan Keene
                                        wrote on last edited by
                                        #34

                                        I work at a 150+ devcount site; we use VSTS/TFS2008, a necessity given the volume of projects and developers. But ... we are also running into ceiling issues with branching/merging and need MS consultancy to repair. TFS is by far the most mature source control system, but is actually not mature enough yet for flagship enterprise usage. Undoubtedly will become so in Rosario++. If you use VSS now and are in a 10+ developer situation, I still would advise migrating to TFS. You will however need someone (+ backup) with more than just suferficial knowledge of the workings of merging and branching. Tips and tricks are required, e.g. when it comes to issues due to renames, deletions, moves, simultaneously in changesets, branching for overlapping release management, component version integration issues, etc. etc.

                                        Regards, Arjan Keene

                                        S 1 Reply Last reply
                                        0
                                        • C Che Mass

                                          Does anyone know of a good source control that has/is: >Branching and Merging >Shallow learning curve >speedy >Good windows tools OR a worthwhile VS plugin I'm looking at subversion (ok, but seems slow), Team foundation (too much - and HOW MUCH???) & Git, but i don't know enough! At the moment we are using the flagship of the microsoft line - SourceSafe! It's fine for most of our little one-man web projects, but for multi-dev use? erm..... No. We're currently working on a project that is different on production, staging and dev. Different bits are added at different times, some things are pushed to production, some things not.... blergh! So, i need a good, easy to use, source control with branching/merging. Over to you....

                                          O Offline
                                          O Offline
                                          otomazeli
                                          wrote on last edited by
                                          #35

                                          Well we use Surround from Seapine and it's an amazing tool much better then Source Safe. http://www.seapine.com/surroundscm.html regards, :-D

                                          1 Reply Last reply
                                          0
                                          Reply
                                          • Reply as topic
                                          Log in to reply
                                          • Oldest to Newest
                                          • Newest to Oldest
                                          • Most Votes


                                          • Login

                                          • Don't have an account? Register

                                          • Login or register to search.
                                          • First post
                                            Last post
                                          0
                                          • Categories
                                          • Recent
                                          • Tags
                                          • Popular
                                          • World
                                          • Users
                                          • Groups