Archive for the ‘DVCS – Distributed Version Control’ Category
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/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 »
Posted by jpluimers on 2014/06/05
TFS 2012 Update 2 and up can do GIT or TFS (now called TFVC for Team Server Version Control). It was improved in TFS 2013, but still it leaves two small problems:
- It cannot host the same repository as both GIT and TFVC.
- It cannot conver from GIT to TFVC or back.
Luckily there are two tools that can help: GIT TF and GIT TFS.
GIT TF (now forked on github a few times) is a way to bridge TFS and GIT. It is different from GIT TFS (that only runs on Windows, it is provided by Microsoft).
You can use both for instance to move GIT to/from TFS, or to compare or leverage GIT against TFS Express and Team Foundation Service which are both free for up to 5 developers. A few notes and some more links: Read the rest of this entry »
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management, TFS (Team Foundation System) | Leave a Comment »
Posted by jpluimers on 2014/06/04
I know covering TFS 2012 has been in the blog queue for way too long (:
A few links:
–jeroen
PS: Nowadays, Team Foundation Service is called “Visual Studio Online”. But many people still call it TFS. See www.visualstudio.com
Posted in CodePlex, Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management, TFS (Team Foundation System) | 1 Comment »