Tag: svn

git-svn problems creating tags

First off, I have no problems at all pushing updates to the origin trunk. If I try creating tags or branches, I get the following error: git svn tag 4.0.6 Copying http://plugins.svn.wordpress.org/xxx/trunk at xxx to http://plugins.svn.wordpress.org/xxx/tags/4.0.6… Authorization failed: POST of ‘/!svn/me’: authorization failed: Could not authenticate to server: rejected Basic challenge (http://plugins.svn.wordpress.org) at /usr/local/Cellar/git/2.4.1/libexec/git-core/git-svn line […]

How to disable pinentry-qt in fedora 20 for git-svn ?

I use git–svn command line client to synchronize my projects to an svn repository. Since I moved to fedora 20 (I was on fedora 17 before), when I synchronize with the svn repository (with git svn rebase, for instance) I have, very often, a pinentry-qt window pop-up. The pinentry-qt popup message looks like “Enter your […]

Undo discarded changes in SourceTree

I am using SourceTree and i had some modified files under “Working Copy Changes” section which were being tracked as shown by the yellow icon in the image. But i discarded those changes. Now how to revert those changes?

How to git version control multiple projects with one framework project?

Well, I took a look at this post GIT Version Control setup for multiple projects with shared code, but turns out that I don’t really think it answers exactly what I want because that is too complex (i guess) for what I need. I work in a company and we have over 4 projects. They […]

git record-only merge / whitelist known breaks from interbranch diff report

I have an automatic report aimed at catching missing commits between release branches based on the output of tgt=$(git rev-parse –verify “origin/${TARGET_BRANCH}”) ref=$(git rev-parse –verify “origin/${REFERENCE_BRANCH}”) git log –oneline –pretty=format:’%h\x1E%ad\x1E%s%d\x1E%an’ –date=short –cherry-pick –right-only –no-merges “${tgt}…${ref}” which works nicely for 99% cases. Sometimes though, usually because of a gentle human touch post-merge/post-cherry-pick there are breaks. Which […]

svn-git : git cat-file “not a valid object name” bad named file unfindable

As you may have understood i am trying to put a SVN repo on Git, and i need to keep the history. I use this command to do it : git svn clone $1 –no-metadata -A authors_git.txt –stdlayout ~/temp But sadly an error occurred, there is a tag with a space in his name and […]

Fusing two git svn repos at point of divergence

So, I’m trying to convert a couple of SVN repos to git–svn repos (in pursuit of cutting out SVN entirely in the long term, so we can shut off our SVN server). Problem, though – the SVN branches have been merged and remerged and split enough times over the last 10 years that I can’t […]

Replay local git-svn history to new svn server (lost access to old svn server)

I had an old svn server and used git-svn to maintain a local copy of the entire history on my machine. I have since lost access to the old svn server but I still have a working git-svn repo on my local machine. Now I would like to export my local repository to a new […]

How to skip first N commits when converting svn repo to Git using reposurgeon?

How do I skip the first two commits of a subversion repository when converting it to Git using reposurgeon? The first svn commit imported code using the wrong branch layout (trunk, tags, branches) and the second commit deleted all of it. The third commit was an import to the correct branch layout (subdir/trunk, subdir/tags, subdir/branches). […]

git-svn clone file integrity

I am responsible for moving some projects from a svn repository to git. I found out the workflow is fairly easy, its not more than a simple git svn clone –stdlayout <svn-repo> <git-repo> cd <git-repo> java -jar ~/svn-migration-scripts.jar clean-git –force The svn-migration-scripts.jar can be found at Atlassians Git Migration Guide, it converts the remote branches […]

Git Baby is a git and github fan, let's start git clone.