Here's the situation: On a particular branch, some changes have been merged in from the trunk, and also changes to the branch have been merged back into the trunk. The question I have is this: What, if anything, does the merge management in Subversion do if I try to merge back into the trunk from the branch a revision that was in itself...
Hi, I've been using TortoiseSVN for a while now for a few of my side projects, but for the hosting I always used some other companies. Now the time has come when at the company where I work, we start experimenting with it and I'd need a few pointers, regarding how to install a svn server. I came accross link text and link text but I'm ...
Under SVN 1.6.5 we have a repo where the "Trunk" is where we do our main development. We have a "Production" branch that is our live website code. When development changes are to be pushed out to the live site we do a range of revisions merge from the trunk to sync the trunk and the branch. In the "Trunk" we have some project inform...
I am using TortoiseGit and am working with an svn repository using git-svn. Sometimes I want to make a one line change and dcommit it to the svn repo immediately (so the CI server will pick up the change). Currently I have to git commit, then dcommit. It's an extra step for something I want to do quickly...it would be nice if I could j...
Im using Visual studio 2008. Every once in a while files that exist in the root of couple of my class libraries disapear from the solution explorer on visual studio. Files exist on subversion. I could not understand the reason of this and it just happened again.. Any one has experienced this problem also? ...
I have to convert a large cc code base - 15 vobs all symbolically linked on windows to a svn repository on solaris. Any help, step by step instructions, scripts are welcome. Thanks ...
We want to start analyzing usage of our various Subversion repositories, which is something I know is stored in our Apache logs. The problem is that I don't know of any tools out there for doing this. If, for example, I want to get a listing per repository of "There were X1 checkins and Y1 checkouts on day W1, X2 checkouts and Y2 checkin...
I’ve got an SVN hook written as a .NET console app and running on VisualSVN server which is causing some problems. Every time I try to commit (either remotely with Tortoise or locally via command line) I get the response “Access Denied”. Looking at the event viewer for VisualSVN there is an error beginning with “Could not MERGE resource…...
I have two svn branches checked out, "b1" and "b2". I would like to merge all of my commits from the "b1" branch onto the "b2" branch. I have tried something like svn merge -r HEAD:HEAD b1 b2 but it does nothing. I am sure I have this command wrong but I can't find good documentation on it. I would like to do this on the client side a...
I have a folder structure like this: /some_folder /tmp /tmp/foo /tmp/foo/fu * /tmp/bar /tmp/bar/bah * /tmp/bar/ba * /tmp/foobar * /more_folders The /tmp directory is being used for caching and whatnot, so I want to have the folder structure under version control, but ignore all the files inside each directory. File...
I am wondering, what kind of code is/should normally be committed to a project repo (branches, not master)? Complete features only? Is it considered wrong/frowned upon to commit half completed code? ...
Is it possible in SVN to set write permission for a single file, while all the rest of the repository is read only. ...
I would like to do exactly as the subject says. It's not possible to merge the current branch to the trunk yet, otherwise, that's what I'd do. The subbranch (or whatever the term is) will be merged with the branch and then the branch back to the trunk. Theoretically, this should work - does anyone see any problems with this? Thanks i...
I have a branch which I created from the trunk some time ago. Since I created the branch, I didn't touch the trunk. Now, I want to return from the branch to the trunk. This is a very simple case, since there's not much merging to do. Nothing changed in the trunk. The branch can fully replace the trunk. As I see it, I have two options: ...
Hello, NOTE: I am aware of the SVN relocate switch, I just need to know if it will be necessary as we don't have a "test" svn server setup. We need to change the port on which SVN runs on. It is obvious that the scripts, clients, etc connecting to this new non-standard port will need to update their connections strings. A concern cam...
I built subversion client (1.6.5) along with its required dependency libs on SuSe 10. I am trying to access our central repository server over https a secured URL. But when i run the svn checkout command giving proper credentials it gives me memory fault. What is that i have missed in building SVN or is that something to do with set up ...
Hi, I use v 3.4.2 of Eclipse and Subversion (using svn 1.4.6 on the server), and I'm having problems understanding the specific options (Depth, Ignore ancestry, etc) and how to merge changes from the trunk into the branch, and back again. Also, when conflicting changes are present, Subversion seems to break - in the compare editor for ...
I seem to remember seeing this somewhere, but for the life of me search is not turning up the results I'm looking for. Here's what I want: I have a project repository. There are libraries in other svn repositories that I'd like to include within my project. When I do an SVN commit on the master project, I'd like all of the files, inc...
Imagine an application with several released versions: V1.0, V1.1, and V1.2. Now imagine one or more associated files that are version-specific, for example a user manual, a functional test suite, or some technical documentation. Ideally these files would be checked into version together with the application itself, so that it's easy to...
So I've converted an SVN repository to a git repository using svn2git, because I assumed there wouldn't be any more work on the svn repository. However, someone else didn't know that we were switching to git (it's a bit complicated, but he was basically just working on one specific file) so he made some commits to SVN. Now I want to get ...