Posted by jpluimers on 2017/03/22
A while ago, I had to rescue a project of a developer that had hosted their SVN repository on a locally running CollabNet installation in a VM that wasn’t properly backed up. So besides pollution of a development system, it had to be resurrected after the host crashed. Apparently
Here are some links without full steps that I used to find my way around, find the SVN repository locations and credentials, then convert it to git (that’s now remotely hosted in multiple places both internally and externally).
No steps as hopefully I will never need to take this route again:
–jeroen
Posted in CollabNet, Development, DVCS - Distributed Version Control, git, Source Code Management, Subversion/SVN | Leave a Comment »
Posted by jpluimers on 2017/03/21
Quick introduction to git internals for people who are not scared by words like Directed Acyclic Graph.
Cool: Git for Computer Scientists [WayBack]
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »
Posted by jpluimers on 2017/03/07
Found out recently that next to rawgit.com there is also raw.githack.com which contrary to the name also supports bitbucket files:
–jeroen
Posted in BitBucket, Development, DVCS - Distributed Version Control, git, githack.com, GitHub, Mercurial/Hg, rawgit, Source Code Management | Leave a Comment »
Posted by jpluimers on 2017/01/24
Interesting read:
SourceTree is the middleman between you and Git, making it really easy to change your commit history through a simple user interface. You can drag and drop commits to reorder them or squash them, you can delete commits, reword the commit messages, edit them, or just leave them be.
More details at Atlassian Blogs: Interactive Rebase with SourceTree
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management, SourceTree | Leave a Comment »
Posted by jpluimers on 2017/01/23
There is a great description for Windows users at: the urban canuk, eh: Configure SourceTree to Rebase by default
Note that this is a global setting for git (which you can override each time you do a pull). So there is no way to differentiate this by repository.
The screenshots for Mac OS X users to configure SourceTree to perform git rebase by default are these:
Read the rest of this entry »
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management, SourceTree | Leave a Comment »
Posted by jpluimers on 2017/01/02
A long time ago (2014!), [WayBack] Great tutorial on how to split older Git commits: http://bit.ly/1rE72cI – should be used with care, but this can be a lifesaver and a really useful trick… – Ilya Grigorik – Google+ pointed me the below tutorial.
It has been in my drafts since then, but recently I found it back when I needed to rebase unpushed commits. Indeed it’s a great tutorial!
Executing the git rebase --interactive concepts can be tricky as they are on a way higher level than regular git work. So sometimes you want to exit vim notifying git to stop the current action. The easiest way I found was this vim command I found at [WayBack] How to abort a git rebase in interactive editor (thanks [WayBack] Telmo Costa!):
:cx
Via the tutorial, I also bumped into a few advanced git add features:
Another very powerfull feature is git add -p a.k.a. git add --patch which allows you to stage parts (or hunks) of a file.
[WayBack] git add -p: The most powerful git feature you’re not using yet
You can go even further with git add --interactive as this blog post shows:
[WayBack] git add –patch and –interactive
Back to the tutorial:
[WayBack] Going back in time to split older commits by thoughtram
Rebasing in Git allows you to go back in time to split older commits. In this article we’ll explore how to do exactly that!
git rebase –interactive
Before the tutorial explains how to amend git commits, it covers these git rebase --interactive commands:
- pick
- reword
- edit
- squash
- fixup
Note that squash will combine the commit on that line with the commit on the line above it.
There is one more little trick: to limit the number of commits (that’s normally limited to the unpushed ones), add like HEAD~4 which limits it to 4 commits.
Finally you can even use this for cherry picking, which I need to put on my research list: [WayBack] git: obtain the benefits of git rebase --interactive for cherry picks – Stack Overflow
Further reading:
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »
Posted by jpluimers on 2016/12/30
When you ship OpenSSL DLLs, you should provide an update mechanism outside of your regular product cycle that updates these shortly after vulnerabilities are fixed.
Few if any products do that. So I made an overview from products and OpenSSL DLL versions I had installed on various systems.
I’m a developer, so the list is biased towards tools I use often.
All of them are vulnerable: [WayBack] https://www.openssl.org/news/vulnerabilities.html
- 1.0.2.h by ContinuaCI 1.8.1.185 PostgreSQL and Avast 12.3
- 1.0.2.g by SourceTree 1.9.x embedded git_local
- 1.0.2d by Git for Windows 2.6.1
- 1.0.2a by SQLite browser 3.7.0
- 1.0.1m by Delphi 10.0 Seattle
- 1.0.1l by Ruby 2.3
- 1.0.1f by SlikSvn 1.8.5
- 1.0.1g by Delphi XE8, Delphi XE7, VMware Workstation OVF tool and Adobe Creative Cloud 2.8.1
- 1.0.0g by Delphi XE6, Delphi XE5, Delphi XE4, Delphi XE3, Appmethod 1.13 and CollabNet SVN Client 1.7.5
- 1.00d by MarkdownPad 2
- 1.0.0 by FinalBuider 7 XE2 and FinalBuilder 7 EE
- 0.9.8za by VMware Remote Console Plug-in 5.1 and VMware Virtual Infrastructure Client 5.1
- 0.9.8y by VMware VIX Workstation 10
- 0.9.8t by Veaam Backup and Replication
- 0.9.8r by ContinuaCI 1.8.1.185 hg support, VMware VIX and VMware Workstation 8.0.2
- 0.9.8q by Veeam Backup Transport, Veaam Backup, xampp 1.7.4 and Replication and VMware Virtual Infrastructure Client 5.0
- 0.9.8o by xampp 1.7.4
- 0.9.8l by xampp 1.7.4
- 0.9.8n by Delphi XE2, Delphi XE and VMware VIX Workstation 7.1.0
- 0.9.8m by VMware VMRC Plug-in, VMware VIX and VMware Workstation 8.0.2
- 0.9.8i by VMware Virtual Infrastructure Client 4.1
- 0.9.8d by Database Workbench Pro 4.4.3, Database Workbench Pro 5.2.4 and VMware vSphere CLI Perl
- 0.9.8b by Adobe Creative Suite 5
- 0.9.7m by VMware VIX server 1.0.9
- 0.9.7l by VMware VIX VIServer 2
- N/A by Adobe Create Suite 5 and VMware VIX server 1
–jeroen
via: [WayBack] Does Delphi installer install OpenSSL dll’s?
PS: Below some Software Archeology related links in the comments.
Posted in .NET, CollabNet, Delphi, Development, DVCS - Distributed Version Control, git, OpenSSL, Power User, Ruby, Security, Software Development, Source Code Management, SourceTree, Subversion/SVN | 7 Comments »
The Wiert Corner - irregular stream of stuff 