The Wiert Corner – irregular stream of stuff

Jeroen W. Pluimers on .NET, C#, Delphi, databases, and personal interests

  • My badges

  • Twitter Updates

  • Pages

  • All categories

  • Enter your email address to subscribe to this blog and receive notifications of new posts by email.

    Join 1,839 other subscribers

Archive for the ‘DVCS – Distributed Version Control’ Category

For GIT/Mercurial users: SourceTree for Windows 1.6.1 – Now Available! (via: SourceTree Blog)

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 »

GitHub System Status

Posted by jpluimers on 2014/08/19

Any site should have a stat system like this: GitHub System Status.

Posted in Development, DVCS - Distributed Version Control, git, Power User, Software Development, Source Code Management, Subversion/SVN | Leave a Comment »

Some notes/links on Git-TF: the GIT/TFS bridge

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:

  1. It cannot host the same repository as both GIT and TFVC.
  2. 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 »

Team Foundation Server Express and Team Foundation Service: some links

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 »

How Do Young Go-Getters Get With Old Git? (via: Dr. Dobb’s – Google+)

Posted by jpluimers on 2014/04/25

Interesting:

How Do Young Go-Getters Get With Old Git?

fournova launches Git learning platform — from command-line interface to GUI

–jeroen

via: Dr. Dobb’s – Google+ – How Do Young Go-Getters Get With Old Git?….

Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »

Enabling HgFlow in SourceTree for Windows: “abort: No module named ConfigParser!” error message with “flow: Flow was already initialized for workspace:”

Posted by jpluimers on 2014/02/20

When you get the below error when adding an HgGlow with SourceTree, then do one of these:

Short error message:

hg flow -y -f init
abort: No module named ConfigParser!

Full error message (the middle line is funny “flow: Flow was already initialized for workspace:”):


hg flow -y -f init
abort: No module named ConfigParser!
flow: Flow was already initialized for workspace:
Completed with errors, see above.

view raw

error.txt

hosted with ❤ by GitHub

Ultimately, hgflow should fix yinwm / hgflow / issues / #8 – Failing on Windows Binary version, but they haven’t for almost 3 years now.

–jeroen

Posted in Development, DVCS - Distributed Version Control, Mercurial/Hg, Software Development, Source Code Management | Tagged: , | Leave a Comment »

Why the Heck is Git so Hard? | Probably Done Before

Posted by jpluimers on 2014/02/04

Why the Heck is Git so Hard? | Probably Done Before is wonderful, especially as it points to workspace • Git Cheatsheet • NDP Software.

And I really like this hacker news comment on it: Read the rest of this entry »

Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | 2 Comments »

git index.lock File exists when I try to commit (via: Stack Overflow)

Posted by jpluimers on 2013/12/29

I had this occur a few times over the last couple of weeks.

The solution is to delete the index.lock file, but I’m not sure if more steps are needed to verify repository content.

Anyone?

–jeroen

via: git index.lock File exists when I try to commit, but cannot delete the file – Stack Overflow.

Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »

Development tools should become more version control friendly, and version control tools more whitespace tolerant

Posted by jpluimers on 2013/11/28

There are a few more messages in the “Missed Schedule” backlog, and I really hope that WordPress is going to address this really annoying bug soon as I have to recheck my blog multiple times a day now.

Back on topic:

Development tools should become more version control friendly, and version control tools more whitespace tolerant

I’m taking Delphi and Bitbucket here as an example, but this holds for many more development tools and version control tools.

Ultimately, you want changes to be as simple as this one: only the relevant changed lines show up as an actual change.

But often changes include convoluted non-relevant information.

A few things development tools should not do: Read the rest of this entry »

Posted in .NET, C#, Delphi, Development, DVCS - Distributed Version Control, Software Development, Source Code Management, Visual Studio and tools | 2 Comments »