Posted by jpluimers on 2015/12/28
Unlike SourceTree for Windows, SourceTree for Mac still doesn’t automagically detect Beyond Compare even though that has been available for Mac OS X since : [SRCTREE-2092] Add built-in support for Beyond Compare version 4 – Atlassian JIRA.
Even modifying my ~/.gitconfig didn’t work, but manual configuration did. Here are the steps:
Posted in Apple, Beyond Compare, Development, DVCS - Distributed Version Control, Keyboards and Keyboard Shortcuts, Mac, Mac OS X / OS X / MacOS, MacBook, MacBook Retina, MacBook-Air, MacBook-Pro, OS X 10.10 Yosemite, OS X 10.8 Mountain Lion, OS X 10.9 Mavericks, Power User, Source Code Management, SourceTree | 3 Comments »
Posted by jpluimers on 2015/11/24
A while ago, I had this error on BitBucket:
Running git.exe with arguments "fetch --prune" failed with return code 128 and error output: "fatal: unable to access 'https://%account%@bitbucket.org/%user%/%repository%.git/': Unknown SSL protocol error in connection to bitbucket.org:443
A quick search for “Unknown SSL protocol error in connection to bitbucket.org:443” pointed me to a comment by Ludwik Trammer on an answer by Jordfräs:
I resolved the issue by upgrading from git 1.8 to git 2.0.
Which reminded me this was a Windows system, where there is no package manager that verifies how far your non-system software is behind.
One day, I will write a script that finds out about the git version history and inform me of major/minor versions I’ve skipped.
Some notes for that:
Probably I will need to do something similar for Mercurial/hg in the future as well.
–jeroen
via: git – Unknown SSL protocol error in connection – Stack Overflow
Posted in Development, DVCS - Distributed Version Control, git, Power User, Software Development, Source Code Management, Windows, Windows 7, Windows 8, Windows 8.1, Windows 9, Windows Server 2008, Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2 | Leave a Comment »
Posted by jpluimers on 2015/10/20
Thanks Ilya Grigorik for sharing this which I found back recently:
Collection of cool hidden (and not so hidden) features of Git and GitHub.
–jeroen
via: Collection of cool hidden (and not so hidden) features of Git and GitHub:….
Posted in Development, DVCS - Distributed Version Control, git, GitHub, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2015/08/13
Besides commit statements from hg or git like this:
hg commit -m “fixes #6, resolve ticket #5 and see ticket #9 and ticket #5 in the tracker”
The best is to start with the command, then finish the comment (commands in the middle of a comment are far less reliable).
There is a whole bunch of commands for which BitBucket tries to understand conjugations of verbs:
Command “Verb” Conjugation(s) resolve close close
closes
closed
closingresolve fix resolve resolve resolve
resolves
resolved
resolvingreopen reopen reopen
reopens
reopeninghold hold hold
holds
holdingwontfix wontfix wontfix invalid invaldate invalidate
invalidates
invalidated
invalidating
You can also use the word “issue” in the middle to just link to an issue like this syntax:
links to issue #1
Finally, you can refer from issues to change sets using a cset syntax: <<cset 2f2f8d4cae7da0e37a5ffbc81c527cb67cc56015>> where the hex number is from a URL in your commit list (for instance in https://bitbucket.org/jeroenp/fastmm/commits)
Note that linking from changesets to issues often automatically creates a back-link, but that doesn’t always work, and fixing it has very low priority (like many things on BitBucket): Issues getting linked to commits have the wrong link syntax, they show BB-6232 — Bitbucket.
–jeroen
via:
Posted in BitBucket, Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Source Code Management | Leave a Comment »
Posted by jpluimers on 2015/08/12
Thanks to the answers and comments on stackoverflow, here are my steps to resurrect a closed hg branch:
hg branches --closedhg update my_closed_branch_namehg tag reopened_my_closed_branchhg commit -m "I changed a message"This works because of what Lazy Badger explained in another answer which summarised is:
A commit on top of a closed head effectively opens the head.
Note: if you while experimenting with this, you want to undo your last change before committing, perform this command to revert back one revision:
hg update -C -r .
The answers and comments (thanks Lóránt Pintér for asking the question):
You can just
hg updateto the closed branch then do anotherhg commitand it will automatically reopen.Theclosedflag is just used to filter out closed branches fromhg branchesandhg headsunless you use the--closedoption – it doesn’t prevent you from using the branches.The commit won’t do anything unless there is something to actually commit, so you may need to make a gratuitous change to make it happen.
A tag is sufficient to make it commitable.
–jeroen
via: Is it possible to reopen a closed branch in Mercurial? – Stack Overflow.
Posted in Development, DVCS - Distributed Version Control, Mercurial/Hg, Source Code Management | Leave a Comment »
Posted by jpluimers on 2015/07/07
The One weird trick for powerful Git aliases – Atlassian Blogs post has many great git aliases, and other Git tricks and references the below great video.
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2015/07/02
Hoping I never need it, but just in case:
Git: Remove sensitive data using git filter-branch and the BFG Repo-Cleaner.
Anyone who knows if there are equivalents for Mercurial/Hg?
–jeroen
via:
Posted in Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Source Code Management | Leave a Comment »
Posted by jpluimers on 2015/06/23
I needed to get an existing Git repository to a client that had a tightened network. No SSH allowed, web proxy filtering out all sorts of sites and also performing a HTTPS man-in-the-middle to detect and reject all kinds of binaries, etc.
But we needed a public repository locally.
Which worked, thanks to pestrella, who answered about `bare` repositories to get my last steps correct:
In order to create a new Git repository from an existing repository one would typically create a new bare repository and push one or more branches from the existing to the new repository.
The trick is to know that server-side repositories are `bare` and client side repositories are `regular`. `bare` means the absence of a working copy on the server side.
I performed these steps:
Read the rest of this entry »
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »
Posted by jpluimers on 2015/06/16
Graeme Geldenhuys posted a great comment below.
Summary:
Git can do SVN, so locally you will see it as a Git repository, but the SVN repository will stay “as is” and not be affected neither will other SVN users be affected.
Two of the great benefits of this:
Combined, you can do these without the need to be online or wait for the SVN connection and transfer:
For instance to view your branches:
git branches -vvOr to show the branch-history:
git show-branch
It is how I access the FastMM repository from Git and described the git commands on how to get started and keep up to date.
Here is Graeme’s comment: Read the rest of this entry »
Posted in Development, DVCS - Distributed Version Control, git, Mercurial/Hg, Software Development, Source Code Management, Subversion/SVN | Leave a Comment »
Posted by jpluimers on 2015/06/11
I wish I had known this years ago. Thanks This is why I code!
This is why I Code Shared publicly: #Git A flowchart to help you with your git decisions http://justinhileman.info/article/git-pretty.
This is the blog post; the chard is below.
Git pretty
This chart is from the presentation Changing History, or How to Git Pretty. Check it out to learn how to use this IRL.
Here’s a printable PDF version, if you’re into that sort of thing.
If you like a more interactive way of decision making, this one is more elaborate: On undoing, fixing, or removing commits in git.
Note that on Windows, git does not like this:
git reset HEAD^
But does like this equivalent:
git reset HEAD~1
–jeroen
via A flowchart to help you with your git….
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »
The Wiert Corner - irregular stream of stuff 