Setting up SVN repositories can be tricky only in the sense of how you organize them. Before we setup SVN, I actually RTFM’d the online Subversion manual which discusses organizational techniques for repositories and some of the gotchas you should think about in advance, namely what you cannot do after you have created your repositories … Read more
The one-step solution would be: git clone –no-checkout <repo_url> or if you already have an empty dir for it, cd myrepo git clone –no-checkout <repo_url> .
SVN cannot handle non-linear history (it simply has no notation of it). So what you want to do is a rebase instead of a merge as it preserves linear history with SVN (this is indicated in on the git-svn man page here. To elaborate, linear histories are trivial. They go in a straight line (A … Read more
I want to be able to perform this diff before merging, including on files without merge conflicts. You just have to set up the index as you like, you never have to commit results. The way to set up for exactly what was asked, straight diffs-since-base with no merge prep, is git merge -s ours … Read more
Starting with X stable / a—b—c—d—e—f—g development You can use the following steps to copy the last commit from your development branch to your stable branch: git checkout development@{0} # get working tree from “development”, detach HEAD git reset –soft stable # reposition detached HEAD on “stable” git commit # enter the appropriate commit message … Read more
I needed to install command line tools from Xcode. To do so- Open Xcode and hit Cmd+, Click Downloads Install command line tools. http://www.hongkiat.com/blog/mountain-lion-git-fix/
Like Cupcake stated, you can’t retain the old signature from the unsquashed commits, but you can sign the new squashed commit if you rebase like this: git rebase –interactive –[email protected] HEAD~4 Adding –[email protected] as an argument will sign the final squashed commit.
Depends to an extent what you mean by “project”. I have a general local repository containing random bits of stuff that I write (including my website, since it’s small). A single-user local SVN repository is not going to suffer noticeable performance issues until you’ve spent a lot of years typing. By which time SVN will … Read more
There are two solutions not mentioned already that you can use: use a topic branch or use cherry-picking. Topic branch solution In the topic branch solution, you switch to branch ‘something’, create a branch to fix a bug e.g. ‘something-bugfix’, merge this branch into ‘something’ (fixing the bug), then merge this branch into ‘experimental’. $ … Read more
Git doesn’t track renames at all, but uses heuristic to re-discover them during merge etc. Mercurial tracks renames (the origin version and origin file is recorded) and uses that information during merges. So you have to explicitly tell hg about renames with hg mv, or use hg addremove –similarity for auto-discovery. There has been some … Read more