Archive for the ‘git’ Category
Posted by jpluimers on 2015/03/03
I am one of the many people complaining about recent SourceTree stability and usability.Issues are not limited to the Windows 1.6.x versions, but since I do most development work on Windows, I wrote Downgrading to SourceTree 1.5.x from 1.6.x, but keeping up with the youngest embedded Git and Mercurial.
This post by Mike Minns (Twitter @brwynant) got my attention: We’re just getting started with SourceTree | SourceTree Blog.
But in order to work with 1.6.x, I’d really love an option to install the 1.6.x versions next to 1.5.x.
Two reasons:
- It will take time to trust 1.6.x versions again
- It is a bit cumbersome to do the 1.5.x downgrade
So Mike, if you read is and can make this possible, please get in touch (and if you ever visit the Amsterdam Atlassian office again, lets grab a beer somewhere).
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Source Code Management, SourceTree | Leave a Comment »
Posted by jpluimers on 2015/01/15
Hopefully it is not a coincidence that Steve Streeting left the SourceTree team four years after the first SourceTree release and shortly after the first release of SourceTree 1.6. version, but the SourceTree 1.6.x versions suck: it often hangs and is (often extremely) slow. This apart from numerous NullReferenceExceptions. I find this odd, as 1.5.x is far more stable in that respect, hence my hope it is not about Steve Streeting.
Even though many people complained about 1.6.x. being bad (read the comments on the release page), and quite a few ask for a way to downgrade, a downgrade option isn’t provided there.
A SourceTree downgrade itself is not that difficult. Ensuring the embedded versions of Git and Mercurial/Hg are up to date is more difficult. Getting that right is especially important on Windows: hgflow works much better with the embedded Mercurial/Hg. More importantly: both Git and Mercurial/Hg recently had a very nasty security issue.
So here are steps on how to downgrade, then upgrade the embedded versions of Git and Mercurial.
Read the rest of this entry »
Posted in Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Power User, Software Development, Source Code Management, SourceTree, Windows | 7 Comments »
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/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 »
The Wiert Corner - irregular stream of stuff 