Archive for the ‘DVCS – Distributed Version Control’ 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/06/09
Now that github stopped showing my README.rst as reStructuredText here is the htmlpreview link of the pandoc rendered reStructuredText:
revue: getting Tumbleweed on it.
It is about installing and configuring Tumbleweed which is a tad bit more frustrating than I hoped for.
In practice unixoids aren’t as heavenly as many geeks pretend them to be.
I got the htmlpreview solution via css – How to see an html page on github as a normal rendered html page to see preview in browser, without downloading? – Stack Overflow.
I might try the github pages in the future.
Sourcecode of htmlpreview is at htmlpreview/htmlpreview.github.com.
–jeroen
via:
Posted in *nix, Development, DVCS - Distributed Version Control, git, GitHub, Linux, openSuSE, Power User, Software Development, Source Code Management, SuSE Linux | Leave a Comment »
Posted by jpluimers on 2015/05/28
A while ago, I was fighting a corporate web proxy playing Man-in-the-Middle on all https sessions.
Though playing MitM on your employees is a debatable thing to do (especially without informing the employees, and illegal in certain countries, I had to get a GIT connection to the outside world working.
This helped tracking it down: GIT_CURL_VERBOSE “unable to get local issuer certificate”.
What I finally did was this:
- obtain the CA certificate that issues the MitM certificate in base-64 CRT form (which is the same as the PEM form):
- added it at the top of either of these files:
"%ProgramFiles%\Git\bin\curl-ca-bundle.crt""%ProgramFiles(x86)%\Git\bin\curl-ca-bundle.crt"
- added it to the top of either of these files:
"%ProgramFiles%\Mercurial\cacert.pem""%ProgramFiles(x86)%\Mercurial\cacert.pem"
–jeroen
PS: These were the failures I was getting:
Read the rest of this entry »
Posted in *nix, cURL, Development, DVCS - Distributed Version Control, git, PKI, Power User, Security, Source Code Management | Leave a Comment »
Posted by jpluimers on 2015/05/22
When during a git svn clone you get an error message starting with “RA layer request failed: PROPFIND request failed on” it means you have to set your git svn proxy.
This is in a different location than the git proxy setting (it would be too easy if these were the same, right?).
So you do not get/set it through commands like these:
git config --global --get http.proxy
git config --global http.proxy localhost:3128
Via Cannot do git-svn fetch behind proxy and git svn clone died of signal 11 under cygwin (thanks janos, Fredrik Pihl and User Pavel, I found out that you need to change these files (create the .subversion directory and servers file when they do not exist):
- Windows:
- %HomeShare%\.subversion\servers
- %UserProfile%\.subversion\serverssour
- Linux:
If you ever run in the same problem with the regular SVN client, then you need to change yet different files (why have 1 standard when you can have many?):
- Windows:
- %AppData%\Roaming\Subversion\servers
- Linux:
Ensure a section like this exists and fill in the blanks:
[global]
# http-proxy-exceptions = *.exception.com, www.internal-site.org
http-proxy-host = YOURPROXY.com
http-proxy-port = YOURPORT
# http-proxy-username = defaultusername
# http-proxy-password = defaultpassword
# http-compression = no
# http-auth-types = basic;digest;negotiate
# No http-timeout, so just use the builtin default.
# No neon-debug-mask, so neon debugging is disabled.
# ssl-authority-files = /path/to/CAcert.pem;/path/to/CAcert2.pem<
Notes:
In some poorly managed networked environments, the %AppData% environment variable can be wrong, so make sure your Windows profile is not somewhere on a network share.
TortoiseGit seems to use yet another directory for GIT SVN server configuration.
–jeroen
via:
Posted in Cntlm, DVCS - Distributed Version Control, git, Power User, Source Code Management, SourceTree, Windows, Windows-Http-Proxy | 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/18
Thanks David Millington for pointing me to How to move your Google Code project to GitHub.
A small quote from it:
By the end of this article, you will have:
- Moved the repository, including commit history, from the Google Code project to a new GitHub project
- Updated the Google Code project to redirect to the new project location
- Updated the Google Code repository so users updating will find out they need to use the new project location
- Set up some basic project settings in your new GitHub project.
–jeroen
via: How to move your Google Code project to GitHub.
Posted in Development, DVCS - Distributed Version Control, GitHub, Google, GoogleCode, Power User, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2015/03/09
Some links I found useful:
- Git workflows:
- Fork versus clone:
- Git supports multiple remote repositories, of which by convention the default is called `origin` and the one you forked from `upstream`:
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a 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 »
The Wiert Corner - irregular stream of stuff 