Archive for the ‘Source Code Management’ Category
Posted by jpluimers on 2014/12/11
One of the long term todo list things is moving a very old project away from StarTeam 5..
Some links I found. Not promising…
–jeroen
Posted in Development, DVCS - Distributed Version Control, Source Code Management, StarTeam, Subversion/SVN | 4 Comments »
Posted by jpluimers on 2014/11/17
This blog entry shows how I moved my BeSharp.net repository from SVN at BeSharp.codeplex.com to mercurial.
I develop most of my software using Windows, so if you want to perform the steps below (except TortoiseHG) on a *nix or Mac machine, you have to do some backslash to slash replacement, and find out where the mercurial settings file is stored.
The rest is pretty much the same.
Note the aim was to do a one time conversion. If you want to use both SVN and HG at the same time, then HgSubVersion definitely worth looking at.
Step zero: enable the convert extension (once per client machine)
Read the rest of this entry »
Posted in Development, DVCS - Distributed Version Control, Mercurial/Hg, Power User, Software Development, Source Code Management, Subversion/SVN, Windows | Leave a Comment »
Posted by jpluimers on 2014/10/30
Session:
Understanding Distributed Version Control
This session helps developers who have been working with a Centralized Version Control System such as SVN to understand and use Distributed Version Control such as GIT or Mercurial. This session focuses primarily on GIT, but applies to Mercurial. We also cover how to use GIT from the RAD Studio IDE.
Level: Beginning
Robert Love – State of Utah
Q&A:
Read the rest of this entry »
Posted in Appmethod, BitBucket, CVS, Delphi, Delphi XE6, Delphi XE7, Development, DVCS - Distributed Version Control, git, GitHub, Mercurial/Hg, Software Development, Source Code Management, SourceTree, Subversion/SVN, TFS (Team Foundation System) | 1 Comment »
Posted by jpluimers on 2014/10/29
One of the things that can make SVN work a mess is to loose track of local directories and files that have been switched (with svn switch) to other URLs in your repository.
The batch file below will help you track those down.
Run it from your repository root.
The batch files uses these things:
Posted in Development, DVCS - Distributed Version Control, Source Code Management, Subversion/SVN | 1 Comment »
Posted by jpluimers on 2014/10/28
One of the hard things in TorsoiseSVN is moving around files and keep their version history.
You can right-drag, but that is not convenient when your VM host is a Mac. And (even if you only use the SVN commandline tools) you have to remember to:
- Create and commit the target directory first
- Move the file using TortoiseSVN
- Commit a directory that is common root to both the source and target directory.
Cumbersome (:
Luckily, there is a trick that works directory on the repository using the Repository Browser. It is not fast, but works splendid.
Thanks to Ralph Whitbeck for answering this on SO:
In TortoiseSVN right click somewhere and go TortoiseSVN > Repo Browser open the repository.
All you then have to do is drag and drop the file from one folder to the where you want it. It’ll ask you to add a commit message and it defaults it to “Moved file/folder remotely”
After this step, you have to perform an SVN Update from the root of your repository for the change to apply locally!
–jeroen
via: tortoisesvn – How do you move a file in SVN? – Stack Overflow.
Posted in Development, Power User, Source Code Management, Subversion/SVN | Leave a Comment »
Posted by jpluimers on 2014/10/09
When using any version control system, understanding which idiom you should follow to do proper branching, merging, tagging, etc is key to your process, and the most difficult thing to get a feel for.
For me, the most confusing part is that branches, tags, and the trunk are directories (both on your development system and the SVN server), and it is hard to see which local directory is switched to what remote one.
As soon as I understood that this was the most confusing aspect for me, I could focus on it and handle it much better.
For SVN (and TortoiseSVN), these links proved to be very valuable for me: Read the rest of this entry »
Posted in Development, Software Development, Source Code Management, Subversion/SVN | Leave a Comment »
Posted by jpluimers on 2014/09/18
Recently I got an error like this in Continua CI:
Build ErrorUnable to start build – No changesets found in repository: [FastMM-jeroenp]
This was about my Git FastMM repository on BitBucket. Which is a Git repository originally gotten through Git SVN (more on that at a later time).
Since it is not an SVN repository, SVN – No changesets found in repository – VSoft Technologies does not apply, but got me closer to the solution
The solution is this
Read the rest of this entry »
Posted in Continua CI, Continuous Integration, Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management, Subversion/SVN | 3 Comments »
Posted by jpluimers on 2014/09/11
For a breaking issue, there has been an important bug fix to Coninua CI. From the downloads page:
From the change log:
Read the rest of this entry »
Posted in .NET, Continua CI, Continuous Integration, Delphi, Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Software Development, Subversion/SVN | Leave a Comment »
Posted by jpluimers on 2014/08/28
Often the git command-line is easier to than merge a combination of changes, moves and deletions using SourceTree.
If you know how to read the git status output, and to act accordingly.
This tells you how: Git: how to resolve merge conflicts | softwarecave.
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Power User, Source Code Management | Leave a Comment »
Posted by jpluimers on 2014/08/20
via the SourceTree for Windows 1.6 – Now Available! | SourceTree Blog.
Make sure you download the 1.6.1 version as that is really the latest:
SourceTree 1.6
Enhancements
- All new file status view
- Improved diff view
- New view configurations
- Cleaner user interface
- All new welcome wizard
SourceTree 1.6.1
Bugfixes
- SRCTREEWIN-1902: Fix crash bug when trying to create a new repo from hosted repos screen
- SRCTREEWIN-1915: Fix a rare crash bug which could happen when closing/re-opening a repository
- SRCTREEWIN-1894: Staging/unstaging will get ‘stuck’ and not refresh the file list if you turn on ‘always display full console output’ when performing these operations. The refreshing now happens regardless of whether that option is turned on or not.
- SRCTREEWIN-1897: Fix a crash bug when listing Stash repos from hosted repos list.
- Confirming removing files now shows the file names in a list so you know which files you’re removing
- SRCTREEWIN-1909: Can now commit files if committing individually even if they’re at the root and not using staging (so either Mercurial, or no staging mode in Git)
–jeroen
via: SourceTree Release Notes.
Posted in Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Software Development, Source Code Management, SourceTree | Leave a Comment »
The Wiert Corner - irregular stream of stuff 