Re: [U2] Mercurial/TortoiseHg source version control
If others in your company are using Mercurial and the idea is to keep everyone's source in the same repository, I would recommend exploring Mercurial first. Perhaps you can ask your sql guys for Mercurial help since they are already using it. rex On Tue, Nov 15, 2011 at 6:37 PM, Wols Lists antli...@youngman.org.uk wrote: On 15/11/11 23:13, Barber, Bonnie wrote: Thanks I will get a copy of git and take a look at it so we have an alternate recommendation just in case mercurial does not work out. ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
We use PRC, which is a PICK based product. We have seen a marked improvement in the whole development cycle since using PRC. Tom Whitmore RATEX Business Solutions -Original Message- From: u2-users-boun...@listserver.u2ug.org [mailto:u2-users-boun...@listserver.u2ug.org] On Behalf Of Barber, Bonnie Sent: Tuesday, November 15, 2011 10:39 AM To: U2 Users List Cc: Winchell, Mike Subject: [U2] Mercurial/TortoiseHg source version control Does or has anyone on this list used Mercurial (UNIX) or TortoiseHg (windows) for Universe program version control. It is used currently here at Perseus for our relational database scripts and code. Now management would like us to use it for our Universe programs also. If anyone is familiar with this product are there any caveats we should know about? Currently we use a homegrown application for our Universe source control. Thanks in advance for any information you might have. Bonnie Barber J ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
Bonnie, I use CVS (currently porting my scripts to use Mercurial) for Universe program version control. A lot depends on your version control paradigm; many software developers checkout their source code and build their software from scratch. This is what I do here; I make changes to the source code repository, build the software accounts, then upgrade existing sites with the new software. Some developers don't build their software, but rather modify production programs on the fly and use version control software to track their changes. Making changes in a development account and copying into production is a variant on this approach. The different approaches to software changes require different capabilities. Which approach is closer to your development method? rex On Tue, Nov 15, 2011 at 10:38 AM, Barber, Bonnie bonnie.bar...@perseusbooks.com wrote: Does or has anyone on this list used Mercurial (UNIX) or TortoiseHg (windows) for Universe program version control. ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
Tom, Would it possible to export all the source code from PRC into a flat file/directory format for Mercurial? rex On Tue, Nov 15, 2011 at 11:05 AM, Tom Whitmore tewhitm...@ratex.com wrote: We use PRC, which is a PICK based product. We have seen a marked improvement in the whole development cycle since using PRC. Tom Whitmore RATEX Business Solutions ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
I use Mercurial for my Unidata source code (which is in DIR files). Have been for maybe 2 years now. I do not try to run a separate working directory for each dev. I basically act as a company librarian and commit all changes for the team. It is not optimum, but it works for us. On Tue, Nov 15, 2011 at 11:30 AM, Rex Gozar rgo...@gmail.com wrote: Tom, Would it possible to export all the source code from PRC into a flat file/directory format for Mercurial? rex On Tue, Nov 15, 2011 at 11:05 AM, Tom Whitmore tewhitm...@ratex.com wrote: We use PRC, which is a PICK based product. We have seen a marked improvement in the whole development cycle since using PRC. Tom Whitmore RATEX Business Solutions ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
Hi Rex, thanks for responding. Our Universe system is on UNIX AIX and for now Mercurial/TortoiseHg is on each developers PC. Our home-grown check-out-check-in tool is just on the UNIX system. We checkout our programs which creates a Universe file version control log for the 'checked-out' program. If the program is new then our tool creates a program template in a development account, if the program pre-exists it makes a copy of the program in the development account. When the developer is done with the program in they 'check-in' the program which moves the current production version to an archive library then moves, compiles, and catalogs the development version to production and updates the version control log with the check-in information. For my initial TortoiseHg tests, I used FTP to get my programs from our UNIX system to my PC then committed them in a tortoise repository. What I do not understand is how to get the programs back out to make changes. The documentation on how this works is somewhat lacking? Bonnie -Original Message- From: u2-users-boun...@listserver.u2ug.org [mailto:u2-users-boun...@listserver.u2ug.org] On Behalf Of Rex Gozar Sent: Tuesday, November 15, 2011 10:19 AM To: U2 Users List Subject: Re: [U2] Mercurial/TortoiseHg source version control Bonnie, I use CVS (currently porting my scripts to use Mercurial) for Universe program version control. A lot depends on your version control paradigm; many software developers checkout their source code and build their software from scratch. This is what I do here; I make changes to the source code repository, build the software accounts, then upgrade existing sites with the new software. Some developers don't build their software, but rather modify production programs on the fly and use version control software to track their changes. Making changes in a development account and copying into production is a variant on this approach. The different approaches to software changes require different capabilities. Which approach is closer to your development method? rex On Tue, Nov 15, 2011 at 10:38 AM, Barber, Bonnie bonnie.bar...@perseusbooks.com wrote: Does or has anyone on this list used Mercurial (UNIX) or TortoiseHg (windows) for Universe program version control. ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
Bonnie, For CVS here, I setup TortoiseCVS to SSH into the linux machine and checkout/checkin changes to the repository. For Mercurial/TortoiseHg there should be something similar, e.g. hg push ssh://hguser@192.168.1.5/hg/, so you can push your changes to your designated repository. Is your repository on the AIX box? Then ssh is probably your best bet. Right now I am using cygwin on my development PC so I can port and test my shell scripts, so I do not have experience with TortoiseHg yet -- just command line stuff. Let me know what you do to get it going so I can copy your settings! rex What I do not understand is how to get the programs back out to make changes. ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
One thing to be aware of with whichever vcs you choose, pat attention to end-of-line characters. There are some configuration settings in mercurial to say these are always unix files and will not let an checkin from a windows machine inadvertently send dos Ctl-M's. Git for aix is available here. http://www.perzl.org/aix/index.php?n=Main.Git Mercurial for AIX can be found here. http://www.lunch.org.uk/aix/rpms/ Note that Tortoise will only let you operate on a local repo. You can push and pull to the remote dvcs server, but any graphs or logs you view will be for your local clone of the servers repo. On Tue, Nov 15, 2011 at 2:23 PM, Rex Gozar rgo...@gmail.com wrote: Bonnie, For CVS here, I setup TortoiseCVS to SSH into the linux machine and checkout/checkin changes to the repository. For Mercurial/TortoiseHg there should be something similar, e.g. hg push ssh://hguser@192.168.1.5/hg/, so you can push your changes to your designated repository. Is your repository on the AIX box? Then ssh is probably your best bet. Right now I am using cygwin on my development PC so I can port and test my shell scripts, so I do not have experience with TortoiseHg yet -- just command line stuff. Let me know what you do to get it going so I can copy your settings! rex What I do not understand is how to get the programs back out to make changes. ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
Hi Rex, It is all in UniVerse or UniData so I believe the answer would be Yes, I'll let Susan reply since it is her product. Also, remember that PRC will track dictionaries, procs, includes, as well as programs, which isn't possible with version control products that are not PICK aware. Tom Whitmore RATEX Business Solutions -Original Message- From: u2-users-boun...@listserver.u2ug.org [mailto:u2-users-boun...@listserver.u2ug.org] On Behalf Of Rex Gozar Sent: Tuesday, November 15, 2011 11:31 AM To: U2 Users List Subject: Re: [U2] Mercurial/TortoiseHg source version control Tom, Would it possible to export all the source code from PRC into a flat file/directory format for Mercurial? rex On Tue, Nov 15, 2011 at 11:05 AM, Tom Whitmore tewhitm...@ratex.com wrote: We use PRC, which is a PICK based product. We have seen a marked improvement in the whole development cycle since using PRC. Tom Whitmore RATEX Business Solutions ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
Does anyone know if PRC has a built-in feature to export all source code into a flat-file/directory format? Either for the head version or the entire repository? If it does, does it also import? It might be nice to be able to allow on the fly changes to the development repository, and still use build tools for a daily build and smoke test. rex ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
On 15/11/11 16:19, Rex Gozar wrote: Bonnie, I use CVS (currently porting my scripts to use Mercurial) for Universe program version control. A lot depends on your version control paradigm; many software developers checkout their source code and build their software from scratch. This is what I do here; I make changes to the source code repository, build the software accounts, then upgrade existing sites with the new software. Except that - iirc (I use git) - mercurial is a DVCS, so the concept of check-in/out no longer exists ... Some developers don't build their software, but rather modify production programs on the fly and use version control software to track their changes. Making changes in a development account and copying into production is a variant on this approach. The different approaches to software changes require different capabilities. Which approach is closer to your development method? If you're using a DVCS, the obvious approach is to declare your production system as the master, test your changes in a development account, and then push the changes into production. The thing to bear in mind is that if you're used to a conventional VCS with a master repository, a DVCS requires a major change to your mindset to use it in the way it is meant to be used. You can still use it the old-fashioned way, but you won't be using the power it is capable of. Cheers, Wol ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
Tom, I keep dictionaries, procs, Q-pointers, programs, and includes in CVS and Mercurial. What do you mean by PICK aware? rex ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
Wol, Even with DVCS, the convention is to designate one of the repositories as the master so everyone can pull/push (checkin/checkout) their changes that end up in a tagged release. The change in mindset has more to do with file versions in CVS and Subversion versus change sets in dvcs. rex The thing to bear in mind is that if you're used to a conventional VCS with a master repository, a DVCS requires a major change to your mindset to use it in the way it is meant to be used. You can still use it the old-fashioned way, but you won't be using the power it is capable of. ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
PRC is written in PICK so it knows about the various types of records we would modify in PICK, and tracks them. Non-PICK tools can read directories, for programs, and includes, but that's it. You would need to create a lot of tools to provide the hooks into the PICK database. Here, when a programmer modifies a dictionary, PRC tracks the change. The same is true with PROCs, programs, etc. I tell PRC what files to track, for dictionaries I just tell PRC to track ALL dictionary changes. It is seamless. My biggest hurdle is the 4GL we are using, it isn't a main-stream 4GL (like SB+) and we needed to modify the 4GL's tools to call PRC. Tom Whitmore RATEX Business Solutions -Original Message- From: u2-users-boun...@listserver.u2ug.org [mailto:u2-users-boun...@listserver.u2ug.org] On Behalf Of Rex Gozar Sent: Tuesday, November 15, 2011 3:07 PM To: U2 Users List Subject: Re: [U2] Mercurial/TortoiseHg source version control Tom, I keep dictionaries, procs, Q-pointers, programs, and includes in CVS and Mercurial. What do you mean by PICK aware? rex ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
And just to add to that, also make sure you handle case sensitivity with your checkouts/ins. File names in particular in the Windows environment may cause issues. For example you can have 2 programs under UV/aix called TEST and Test in the same program file (path). In Windows, which is case insensitive, you could only have one. I don't know hg but this may also be true for the repository if it's on a Windows server. Cheers, Stuart From: Steve Romanow Sent: 16-Nov-11 6:44 To: U2 Users List Subject: Re: [U2] Mercurial/TortoiseHg source version control One thing to be aware of with whichever vcs you choose, pat attention to end-of-line characters. There are some configuration settings in mercurial to say these are always unix files and will not let an checkin from a windows machine inadvertently send dos Ctl-M's. Git for aix is available here. http://www.perzl.org/aix/index.php?n=Main.Git Mercurial for AIX can be found here. http://www.lunch.org.uk/aix/rpms/ Note that Tortoise will only let you operate on a local repo. You can push and pull to the remote dvcs server, but any graphs or logs you view will be for your local clone of the servers repo. On Tue, Nov 15, 2011 at 2:23 PM, Rex Gozar rgo...@gmail.com wrote: Bonnie, For CVS here, I setup TortoiseCVS to SSH into the linux machine and checkout/checkin changes to the repository. For Mercurial/TortoiseHg there should be something similar, e.g. hg push ssh://hguser@192.168.1.5/hg/, so you can push your changes to your designated repository. Is your repository on the AIX box? Then ssh is probably your best bet. Right now I am using cygwin on my development PC so I can port and test my shell scripts, so I do not have experience with TortoiseHg yet -- just command line stuff. Let me know what you do to get it going so I can copy your settings! rex What I do not understand is how to get the programs back out to make changes. ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
I will be glad to, if I ever get it figured out. I am still confused by all the new verbiage that goes with it, for instance the statement in the reply from WOL Lists: Except that - iirc (I use git) - mercurial is a DVCS, so the concept of check-in/out no longer exists ... I am just an old PICK person; this is all new stuff to me, LOL!! Bonnie -Original Message- From: u2-users-boun...@listserver.u2ug.org [mailto:u2-users-boun...@listserver.u2ug.org] On Behalf Of Rex Gozar Sent: Tuesday, November 15, 2011 1:24 PM To: U2 Users List Subject: Re: [U2] Mercurial/TortoiseHg source version control Bonnie, For CVS here, I setup TortoiseCVS to SSH into the linux machine and checkout/checkin changes to the repository. For Mercurial/TortoiseHg there should be something similar, e.g. hg push ssh://hguser@192.168.1.5/hg/, so you can push your changes to your designated repository. Is your repository on the AIX box? Then ssh is probably your best bet. Right now I am using cygwin on my development PC so I can port and test my shell scripts, so I do not have experience with TortoiseHg yet -- just command line stuff. Let me know what you do to get it going so I can copy your settings! rex What I do not understand is how to get the programs back out to make changes. ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
Without going in to much detail, this can all be done in Eclipse IDE. I can copy all of the programs from an account to my workstation which can then be loaded into any version control system that has an Eclipse plug-in like MS Team Foundation Server, CVS, Subversion, Git, Mercurial, and Perforce to name the ones I know off. The Mercurial eclipse plug-in is at http://www.javaforge.com/project/HGE. Of course, you need an Eclipse plug-in that is Unidata or Universe aware. There are other tools that allow building of accounts daily, hourly, or whatever as well for Universe and Unidata databases. [ad] Those tools are XLr8Editor for programs, procs, dictionaries, and all files. XLr8Installer for the install you demo, QA, or production accounts. These tools are very cost effective at $49.00 for the XLr8Editor and $99.00 for the XLr8Installer. See u2logic.com/tools.html for more information.[/ad] Regards, Doug www.u2logic.com On Tue, Nov 15, 2011 at 12:59 PM, Rex Gozar rgo...@gmail.com wrote: Does anyone know if PRC has a built-in feature to export all source code into a flat-file/directory format? Either for the head version or the entire repository? If it does, does it also import? It might be nice to be able to allow on the fly changes to the development repository, and still use build tools for a daily build and smoke test. rex ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
I think I am about to convert to git. After using both for a while, git is growing on me. It is a less opinionated tool. By that I suggest that is supports more workflows. On Tue, Nov 15, 2011 at 3:47 PM, Barber, Bonnie bonnie.bar...@perseusbooks.com wrote: I will be glad to, if I ever get it figured out. I am still confused by all the new verbiage that goes with it, for instance the statement in the reply from WOL Lists: Except that - iirc (I use git) - mercurial is a DVCS, so the concept of check-in/out no longer exists ... I am just an old PICK person; this is all new stuff to me, LOL!! Bonnie -Original Message- From: u2-users-boun...@listserver.u2ug.org [mailto:u2-users-boun...@listserver.u2ug.org] On Behalf Of Rex Gozar Sent: Tuesday, November 15, 2011 1:24 PM To: U2 Users List Subject: Re: [U2] Mercurial/TortoiseHg source version control Bonnie, For CVS here, I setup TortoiseCVS to SSH into the linux machine and checkout/checkin changes to the repository. For Mercurial/TortoiseHg there should be something similar, e.g. hg push ssh://hguser@192.168.1.5/hg/, so you can push your changes to your designated repository. Is your repository on the AIX box? Then ssh is probably your best bet. Right now I am using cygwin on my development PC so I can port and test my shell scripts, so I do not have experience with TortoiseHg yet -- just command line stuff. Let me know what you do to get it going so I can copy your settings! rex What I do not understand is how to get the programs back out to make changes. ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
On 15/11/11 20:47, Barber, Bonnie wrote: I will be glad to, if I ever get it figured out. I am still confused by all the new verbiage that goes with it, for instance the statement in the reply from WOL Lists: Except that - iirc (I use git) - mercurial is a DVCS, so the concept of check-in/out no longer exists ... I am just an old PICK person; this is all new stuff to me, LOL!! DVCS - Distributed Version Control System. The whole point of which is that there is no central master. In practice there is, but the software doesn't assume it (and in git's case at the software level actively blocks it). Take LibreOffice for example. There is a central repository that the developers recognise as the master copy, and all official releases are made from that copy, but as far as the software is concerned there is nothing special about it. The copy on my hard disk is identical to the master copy. It's just that the typical guy can only copy *from* the master. I happen to have a key that lets me push *to* the master. But if I want to push my changes, I first sync my master copy with the central copy. Then I sync my development copy with my new master copy. Then, because I can, I push my changes from my master to the central copy. Somebody without the key would have to publish those changes and wait for somebody like me to add them to my system, approve them, and push them. Contrast this with my experience of Visual Source Safe, where I would be working on a module when somebody else needed to do an urgent bug fix. They couldn't bug-fix because I had the module checked out, so I had to abandon my changes and release it to them, wait for them to bugfix, then reclaim it and redo my changes. A right pain in the proverbial... Git gets round this by letting me develop in isolation, then helps me sync my work with all the changes that others have made, before pushing my changes into the master copy. It's even better than that, because if you're a lone developer it allows you to develop multiple paths in isolation from each other, and only merge each change into the master copy when you've tested it and are happy with it. So if you suddenly discover a nasty bug in the module you're doing new development on, you can stash your development away and revert to the live version, fix the bug, revert back to the development version, and roll the bugfix forward into the development version. If you've got no version control system, even if you're a developer in a decent-sized shop, try installing git and playing with it for your own work. Even in that Visual Source Safe hell I described, it's great. You can develop without needing to check out from the centre. And when you're happy with your code, you sync your master branch with the centre, checkout the code from the centre, merge your changes into the master, check it again in case somebody else's changes break your changes, then commit your changes and free the centre. That way you could have been developing for weeks, *without* interfering with other developers in the process - you only need access to the checked-out copy for as long as it takes you to check and QA your changes. Cheers, Wol ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
Thanks I will get a copy of git and take a look at it so we have an alternate recommendation just in case mercurial does not work out. Bonnie -Original Message- From: u2-users-boun...@listserver.u2ug.org [mailto:u2-users-boun...@listserver.u2ug.org] On Behalf Of Wols Lists Sent: Tuesday, November 15, 2011 5:05 PM To: u2-users@listserver.u2ug.org Subject: Re: [U2] Mercurial/TortoiseHg source version control On 15/11/11 20:47, Barber, Bonnie wrote: I will be glad to, if I ever get it figured out. I am still confused by all the new verbiage that goes with it, for instance the statement in the reply from WOL Lists: Except that - iirc (I use git) - mercurial is a DVCS, so the concept of check-in/out no longer exists ... I am just an old PICK person; this is all new stuff to me, LOL!! DVCS - Distributed Version Control System. The whole point of which is that there is no central master. In practice there is, but the software doesn't assume it (and in git's case at the software level actively blocks it). Take LibreOffice for example. There is a central repository that the developers recognise as the master copy, and all official releases are made from that copy, but as far as the software is concerned there is nothing special about it. The copy on my hard disk is identical to the master copy. It's just that the typical guy can only copy *from* the master. I happen to have a key that lets me push *to* the master. But if I want to push my changes, I first sync my master copy with the central copy. Then I sync my development copy with my new master copy. Then, because I can, I push my changes from my master to the central copy. Somebody without the key would have to publish those changes and wait for somebody like me to add them to my system, approve them, and push them. Contrast this with my experience of Visual Source Safe, where I would be working on a module when somebody else needed to do an urgent bug fix. They couldn't bug-fix because I had the module checked out, so I had to abandon my changes and release it to them, wait for them to bugfix, then reclaim it and redo my changes. A right pain in the proverbial... Git gets round this by letting me develop in isolation, then helps me sync my work with all the changes that others have made, before pushing my changes into the master copy. It's even better than that, because if you're a lone developer it allows you to develop multiple paths in isolation from each other, and only merge each change into the master copy when you've tested it and are happy with it. So if you suddenly discover a nasty bug in the module you're doing new development on, you can stash your development away and revert to the live version, fix the bug, revert back to the development version, and roll the bugfix forward into the development version. If you've got no version control system, even if you're a developer in a decent-sized shop, try installing git and playing with it for your own work. Even in that Visual Source Safe hell I described, it's great. You can develop without needing to check out from the centre. And when you're happy with your code, you sync your master branch with the centre, checkout the code from the centre, merge your changes into the master, check it again in case somebody else's changes break your changes, then commit your changes and free the centre. That way you could have been developing for weeks, *without* interfering with other developers in the process - you only need access to the checked-out copy for as long as it takes you to check and QA your changes. Cheers, Wol ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
Re: [U2] Mercurial/TortoiseHg source version control
On 15/11/11 23:13, Barber, Bonnie wrote: Thanks I will get a copy of git and take a look at it so we have an alternate recommendation just in case mercurial does not work out. Bonnie I can't remember where I came across it, and what the differences were, but there was an article some time back (possibly lwn) that said there appeared to be a difference between the sort of developer who prefers mercurial, and the sort who prefers git. It's something to do with the approach they take - each makes some things easy and others why would you want to do that? Just see which one suits you best, and as I say, even if you're in a team that uses something else, git is great for personal use if that's what works for you. You'll probably even find you can sync your git master with the mercurial central master! Cheers, Wol ___ U2-Users mailing list U2-Users@listserver.u2ug.org http://listserver.u2ug.org/mailman/listinfo/u2-users
