We seem to be in the golden age of version control, with a ton of choices, all of which have their pros and cons. Here are the ones I see most used: svn – currently the most popular open source? git – very hot since Linus switched to it mercurial – some smart people I … Read more
To complement torek’s excellent answer: A force-push can cause problems with later merges. The problem: If you force-push a branch A, you are removing some existing commits from that branch (otherwise you would not need to force). If (as described in torek’s answer) these commits are also referenced from another branch B, then they will … Read more
As I was struggling with it for a while, even with the description, and I think this is relevant for others too, I thought I’d post an implementation of how what J16 SDiZ described could be implemented. So, my take on the server-side update hook preventing too big files to be pushed: #!/bin/bash # Script … Read more
Version numbering policies can be a bit crazy at times (see Version numbers and JSR277, or Oracle, with its Oracle Database 11g Release 2: 11.2.0.1.0. See also Software Versioning is Ridiculous). But you can start by looking at the Eclipse Version Number policy as a good start. If you really think you need more than … Read more
It’s not possible. The changes you commit are related to the current working copy. If you want to commit to another branch it means that you could commit changes from your working copy, but base them from another copy state. This is not a natural way of versioning your work, and this is why you … Read more
It is possible but not necessarily simple: the problem you are trying to solve is dangerously close to setting up a distributed development environment which is not exactly what SVN is designed for. The SVN-mirror way You can use svn mirror as explained in the SVN book documentation to create a read-only mirror of your … Read more
As the message says: no changes added to commit (use “git add” and/or “git commit -a”) Git has a “staging area” where files need to be added before being committed, you can read an explanation of it here. For your specific example, you can use: git commit -am “save arezzo files” (note the extra a … Read more
I think you should avoid this path at all cost, and try and persuade management into redevelopment. It’s a bitter pill to swallow, but this is going to need to be redeveloped sooner or later, and you are just saving them time and money.
There are two ways to accomplish the task. Depending on Subversion server distribution and task complexity you may find one of them easier or more convenient than the other. Filtering repository history with svndumpfilter tool The solution is quite tricky because Subversion repository history filtering works based on paths you specify to include or exclude … Read more
Change to the main directory, checkout the master branch, and do the following Git command to create a new submodule for plugin1: git submodule add (url_to_plugin1_repository) subdirectory1/plugin1sm Here the “url_to_plugin1_repository” points to your current Git repository for plugin1. A new directory will be created call subdirectory1/plugin1sm, which will track your remote repository. I have given … Read more