In Subversion, it is easy to merge a range of changesets/diffs from a branch using "svn merge -r a:b mybranch". But in git, I found it is only possible to cherry-pick a single commit from a branch to apply that patch to my current working branch. So I am wondering if there is a fast way to apply all the commits in one swoop between two t...
I noticed that Eclipse (Flex Builder) generates hundreds of metadata files. Should I check them into my source control? They seem necessary, because if I delete them Flex Builder just opens up an empty workbench... Some of these files plainly do not belong in source control (like .history files and some cache files). If I delete them my...
So which tool is the best? ...
Hi, I'm using Eclipse Europa with Subversive SVN plugin. When try to commit deleted directory SVN returns this message: Some of selected resources were not committed. Item is out of date svn: Commit failed (details follow): svn: Item '/myProject/trunk/src/test/config' is out of date Content of the folder has been already deleted and...
I've heard repeatedly that XCode's integration with SVN is lacking, but seeing as I have personally never used it, I cannot help but wonder why. Now I'm starting a new project, and once again SCM has come up. This time though, I think I want a better idea of what exactly XCode does and doesn't do right with SVN. So, have any horror sto...
When publishing an asp.net web site in Visual Studio 2008, is there a way that I can force it to ignore the .svn folders in my local working copy so that my target folder does not end up with .svn files as part of the output. Thanks, Jason ...
How do I change the color coding in the right margin of Netbeans? The part where subversion keeps track of the changes, deletes, adds, etc. The only reference I've found was the Netbeans subversion guide that tells you what they are, but doesn't explain how to configure or disable it. (is it even configurable?) So I did some more sea...
I am new to git, and have a subversion repository that I want to be able to import into a git repository occasionally (for deployment). So I want to perform most of the updates using svn but wanted to see what's the best way to push it to git (just the default/master branch). ...
I have a web application that I am trying to build and publish. The odd thing is that when I do clean, build or rebuild everything seems fine. When I do a publish though I get the message that the publish failed, but get no further information: ========== Publish: 0 succeeded, 1 failed, 0 skipped ========== If in the copy section I ...
At my company we have a group of 8 web developers for our business web site (entirely written in PHP, but that shouldn't matter). Everyone in the group is working on different projects at the same time and whenever they're done with their task, they immediately deploy it (cause business is moving fast these days). Currently the develop...
I'm trying to integrate Redmine with TortoiseSVN, but I was not able to do that because TSVN always gives me this error" "There are no issue-tracker providers available." I have made these steps : On my project folder properties I have added "bugtraq:url -> http://myweb/../issues/show/%BUGID%" On Redmine settings I have added t...
I have found that when I need to rename a Java class (and therefore the source file) or need to change the package name (and therefore move the source file[s]), I can either: Use the nice and useful Eclipse refactoring tools which is great since all the cascading tasks are done for me. However, I then have an uphill struggle with Subve...
Just moved to subversion...from visual studio. I love it already! Can someone briefly explain Repository Branches Tags Trunk Do I need to create a new repository for every project? Or a new trunk? Thanks ...
I'm trying to automate the build process for engineering group. As part of that automation, I'm trying to get to a point where the act of applying a specific tag that adheres to a pattern will kick off an automated process that will do the following: Check out source code Create a build script from a template Build the project I'm p...
This is kind of a usability question for using VS2005: I have different branches of the same Visual Studio 2005 solution checked out from version control. The solution and project files are also under version control. On my development workstation, I sometimes have multiple instances of Visual Studio opened on a different version or bran...
While attempting to get an old svn dump of a project under git control, I ran into an interesting problem. Whenever I run git svn, I get an error saying it isn't a git command, yet there is documentation for it that I can pull up using git help. Is there something wrong with my install, or am I just missing something here? Edit: I sh...
I have a maven pom build file in the root directory of my project. When trying to synchronize with SVN repository from Eclipse (Europa), red double directed arrow is being added to the file icon. This means that both my local copy and the one in the repository have been changed since last synchronization. When I try to do do 'Override a...
Using Suversion and WinDiff its no problem to branch / merge class-projects and web-projects. The only kind of project I can never merge are winform projects. The InitializeComponent method is always scrambled after only little changes. Is there any good way to enable diff / merge for .Designer - files? EDIT: I used a 3 way diff lik...
To start out, I have looked at the following pages and don't quite have my answer: how-would-you-organize-a-subversion-repository-for-in-house-software-projects and how-do-you-organize-your-version-control-repository I have also looked at chapter 8 of Pragmatic Version Control using Subversion. They all have good advice, but I'm having...
Hi everyone, for quite a while now, I've been trying to figure out how to setup an automated build process at our shop. I've read many posts and guides on this matter and none of them really fits my specifics needs. My SVN repository is laid out as follows \projects \projectA (a product) \tags \1.0.0.1 \...