So in SVN you can do things like:
svn merge -r555:558
svn diff -c551
but (as far as I know) there is no way to do:
svn merge -r555:558, 592:594
svn diff -c551, 557, 563
For merges you can always just do several commands in sequence:
svn merge -r555:558
svn merge -r592:594
but for diffs doing that will just result in multiple dif...
As the title suggests, I am curious as to why so many people tout Git as a superior alternative to branching/merging over SVN. I am primarily curious because SVN merging sucks and I would like an alternative solution.
How does Git handle merging better? How does it work?
For example, in SVN, if I have the following line:
Hello World!
...
I have a medium sized team of developers who moved to Subversion last December from VSS and I wanted to hear from people who have used both Mercurial and Subversion and get their feedback.
What do they really like about Mercurial? What sucks? Is there a better open source tool? I didn't really want to put my devs through the whole sou...
Is it possible to query for all activity relating to a specific user across all repositories. Including any check out action? Thanks.
...
Recently there was a post to the subversion dev mailing list suggesting a vision and roadmap for the future of Subversion. As a result, I'm posting this to elicit some suggestions and contributions from the users of Subversion. Any comments are welcome, and I shall feedback a synopsis with a link to this question to the dev mailing list....
I'm trying to wrap a standard sequence of steps in a shell script (linux/bash) and can't seem to figure out how to tell if the execution of svn status returned anything. For example
~/sandbox/$svn status
? pat/foo
~/sandbox/$echo $?
0
If I delete the foo file, then the
svn status
return nothing, but the echo $? is still 0
I ...
I'm using svn. I have two branches and on both of them were performed a lot of changes.
In addition of one of the branches a lot of files were renamed, so now svn can not help me merge changes in those files (well know svn limitation).
Is it possible using git-svn to perform the merge of the branches?
Will git-svn handle renamed files ...
A developer of ours tends not to specify messages when committing his code, I know I could jump up and down and force him to do so from here on in, but how do I deal with the previous commits.
I'd very much like to go in and edit the messages so that they are descriptive of what they do.
How might I go about doing this?
...
Is there a way to setup a global list of Ignores for a SVN Repository or for the SVN Client on the PC?
The only reason I'm using tools like Tortoise/Ankh/VisualSVN is because I want to only check in the files I need without all the bin/obj/Resharper stuff.
I'm spoiled by .gitignore and .hgignore which I just copy to a repository and th...
I have two CVS projects, which I maintain in Eclipse. I check out first project, and for second project I use "checkout in existing project" option, so I'm able to maintain two CVS projects into one Eclipse project. Doing this I'm able to Tag both projects with the same tag,etc.
And know, time has come to start using SVN. I was able to ...
Is there a simple way to export the subversion logs to a CSV file?
I want to use them to approximate my hours spent on a project and doing so in an spreadsheet would be easy.
Thanks.
...
Hi,
I have successfully setup Subversion repositories using SVNParentPath. But I would like to control the view of repositories list based on user access permission. Example User A only can access repository A and repository B. So when he browse to SVN url he only can see repository A and repository B. Others repositories are invisible ...
I've recently been trying out Ankhsvn and I quite like it, and more importantly, it generally likes me.
But I've hit a problem adding existing VS projects to subversion using AnkhSVN. Most Windows and Web projects are added fine, but I have a problem when I try to a Websites (as opposed to Web Applications), and in these cases I get the...
I have a project on github but I need to maintain a svn repo updated with every push.
I have checked this question but I want to do it automatically.
Is there a way to tell github to do a svn ci when a push occurs?
...
I have a copy of the contents of an svn branch locally without any .svn folders. The equivalent of the output of an svn export of that branch. I'd like to link up this directory to its corresponding branch in version control, without having to do an svn checkout followed by manually merging my changes in. Is there some way to do this ea...
I have a primary git repository for an opensource project
I want to mirror all commits to svn repository (on code.google.com), does it possible ?
...
Since we've switched to VS2010 we've noticed a new .filters file that apparently contains the filter structure of the project. We're also using subversion as our source control.
Unfortunately, every time we check in now we end up with merge conflicts if anyone's added a file or filter to the project. SVN seems absolutely incapable of ...
I set up SCM (SVN) for my ipad project. checkout etc. worked good, but when i want to commit changes i get following error:
Error: 125001 (Bogus filename) Description: Couldn't determine absolute path of '.'
any advice?
thanks + regards
...
I'm using apache+svn
apache config file:
LoadModule dav_module modules/mod_dav.so
LoadModule dav_svn_module modules/mod_dav_svn.so
LoadModule authz_svn_module modules/mod_authz_svn.so
<Location /code>
DAV svn
SVNParentPath "c:/repositories"
</Location>
Imagine i have this file structure (in every t? i have one svn repository...
I'd like to learn other people workflow when using either vcs or dvcs.
Please describe your strategy to handle the following tasks:
Implement a feature
Fixing bugs (during development and deployed app)
Code Review
Refactoring code (post code-review)
Incorporate patches
Releasing the newer version of your app (desktop, web, mobile, w...