While working on addons.mozilla.org I ran into an issue of git svn rebase continually asking me to merge a file, over and over.
I had a branch open for a bug. In that branch I wrote a library. While that bug was under review, I had to use that library in a new branch [...]
Filed under spindrop. |
Tags: git && git-svn && mozilla && svn
One of the most annoying things about creating new SVN projects is the new project dance:
$ svnadmin create $SVNREP_DIR/newproject
$ svn mkdir -m “layout creation” file:///$SVNREP_DIR/newproject/trunk file:///$SVNREP_DIR/newproject/tags file:///$SVNREP_DIR/newproject/branches
$ mkdir newproject
$ cd newproject
$ svn import -m “initial import” . file:///$SVNREP_DIR/newproject/trunk
Oh… yeah, no this isn’t that bad.
It’s this part that’s bad:
$ cd ..
$ mv newproject newproject.tmp
$ svn co [...]
Filed under spindrop. |
Tags: hg && mercurial && svn