Even though this is an old question, the current state of affairs with git-svn has changed since it was asked. Specifically, in git 1.7.5, there is some limited support for setting the svn:mergeinfo when dcommitting back to svn. git svn dcommit now accepts the -mergeinfo=<mergeinfo> flag. To quote from the 1.7.5+ man page: -mergeinfo=<mergeinfo> Add … Read more
One windows I use TortoiseSVN, best SCM client on the planet. On Linux the closest I can get is installing meld and running the following subversion command: svn diff MyFile.txt –diff-cmd meld
We struggled with this issue for few weeks and we finally got it solved. In our case, we worked on a branch that was merged with all trunk revisions on a daily basis. When we tried to reintegrate it (merge back to trunk) we got this error. When we tried to merge the missing ranges … Read more
Try svn status –show-updates The -u (or –show-updates) option to svn status causes svn to contact the repository and show stuff that’s changed in the repository – is that enough for you ? Depending on what you need, you might want the -q or –verbose flag too
I think a good strategy here is to use the install profile API. With install profile API you can do most things that using the Drupal admin tools do. Most core forms simply set variables in the variables table. To be able to sensibly version your non content database contents i.e. configuration it is wise … Read more
Fisheye, from Atlassian, looks at an SVN repository and can show you a few graphs. Also provides a handy web interface for blame, diff, etc. for example, some sample images at one of the demo servers: And if you like some pretty code metrics, here are some samples.
To undo revisions 118 and 120: svn up -r HEAD # get latest revision svn merge -c -120 . # undo revision 120 svn merge -c -118 . # undo revision 118 svn commit # after solving problems (if any) Also see the description in Undoing changes. Note the minus in the -c -120 argument. … Read more
The best way to do this is to use git svn as a Subversion client. This provides two-way integration between a Subversion repository and a Git repository. Once you have a Git repository, you can push that anywhere else to publish it. I do this regularly, at work there is a Subversion repository that is … Read more
When working with a branch, you should periodically merge ranges of revisions from the trunk into the branch to keep the branch in sync. if you don’t pass any version numbers to svn merge and your svn server version is 1.5 or newer, it will track the merges you’ve previously done and automatically merge only … Read more
In case somebody else stumbles onto this issue, the best luck I’ve had is Settings > Version Control > Ignored Files Add “Ignore all Files Matching”s for: *.idea *.iml Not sure which version of IDEA rolled out this functionality, and this question is somewhat old, so it may be moot. Just hope it helps somebody … Read more