Archive for the ‘Mercurial/Hg’ Category
Posted by jpluimers on 2015/06/10
After reading Converting Hg repositories to Git directed me into reading Bitbucket: Converting Hg repositories to Git I hoped moving my Mercurial repository on BitBucket to a Git repository would be something like following the steps.
It wasn’t.
First of all, hg-git on a Windows system requires Python or TortoiseHg. Neither of these I wanted to install for a one-off conversion.
So I took a throw-away Linux VM, and did the steps below. But let me first explain why.
Motivation
My motivation for moving away from BitBucket to GitHub, especially for projects containing markdown documentation.
When writing documentation in Markdown, being able to in-line reference pictures or have relative-references to other documents. This works perfectly in local Markdown tools (like MarkdownPad 2 or LightPaper).
Read the rest of this entry »
Posted in *nix, *nix-tools, BitBucket, Development, DVCS - Distributed Version Control, git, GitHub, Linux, Mercurial/Hg, openSuSE, Power User, Source Code Management, SuSE Linux | Leave a Comment »
Posted by jpluimers on 2015/05/20
Adding relative links to screenshots in markdown files (like README.md) works way better at GitHub than on BitBucket:
For GitHub, this works, has documentation and various places with tips:
In fact it is a reason for some people to move public projects from Bitbucket to GitHub.
For private repositories that is different as GitHub charges for private repositories, but BitBucket has free private repositories.
Note: if you go the npm way, then you might want to have absolute URLs: Add images to readme.md in GitHub – Stack Overflow.
–jeroen
via: git – How to add screenshot to READMEs in github repository ? – Stack Overflow.
Posted in BitBucket, Development, DVCS - Distributed Version Control, git, GitHub, MarkDown, Mercurial/Hg, Power User, Source Code Management, SourceTree | Leave a Comment »
Posted by jpluimers on 2015/04/10
This is an elaboration of How to fill proxy information in cntlm config file – Stack Overflow.
When digging around how to get authentication stuff going, I want as much information, so this was the command-line I used:
cntlm.exe -v -c cntlm.ini -I -M http://www.bbc.co.uk
The -v is important: it shows you why things fail, and where: It also shows you the NTLM headers sent back/forth over the wire.
These are the switches used:
- -v verbose
- -c configuration file
- -I interactive (prompt for password)
- -M magically detect the NTLM level used by the proxy
Since it is unsafe to store plain text passwords in configuration files, cntlm allows you to store the hashes.
Storing hashes not passwords locally is safer, but not much safer. See for instance Still Passing the Hash 15 Years Later: Guest Post: Let’s talk about Pass-the-Hash by Scriptjunkie the video How to own a Windows Domain or search for Mark Russinovich video windows hash ntlm hack.
Anyway: you can generate the password hashes using either Read the rest of this entry »
Posted in Development, DVCS - Distributed Version Control, Fiddler, git, HTTP, Internet protocol suite, Mercurial/Hg, NTLM, Power User, Software Development, Source Code Management, TCP, Web Development, Windows, Windows 7, Windows 8, Windows 8.1, Windows Server 2008, Windows Server 2008 R2, Windows Vista | 1 Comment »
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/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/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/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 