Tortoise SVN diff two trees

Posted by Midhat on Stack Overflow See other posts from Stack Overflow or by Midhat
Published on 2010-03-31T07:17:03Z Indexed on 2010/03/31 7:23 UTC
Read the original article Hit count: 229

Filed under:

svn

|

tortoisesvn

Hi

Consider the following situation

Code was added to the trunk at revision x
A branch was created
The modifications of rev x were removed from trunk in rev x+10
trunk and branch goes their own ways till rev x+100
Now we need to update the branch with changes form the trunk

The problem with a simple "merge a range of revisions" is that due to step 3, the initial branch modifications are being removed. Is there any way to work around this without resorting to manual merge.

Version Info: TortoiseSVN 1.6.7, Build 18415 - 32 Bit , 2010/01/22 17:55:06 Subversion 1.6.9,

© Stack Overflow or respective owner

Related posts about svn

`svn checkout` on the SVN server causes the repo to break with a 301 error

as seen on Server Fault - Search for 'Server Fault'
We have an nginx server which proxies to a standard set-up of Apache+SVN. The nginx set-up is a very simple proxy: server { server_name svn.ourdomain.tld; location / { proxy_pass http://localhost:8080; } } Apache is set-up as follows: <Location /> DAV svn SVNParentPath… >>> More
Can't create directory named "mysql" in subversion repository

as seen on Server Fault - Search for 'Server Fault'
I have a particular problem with subversion. Environment: subversion (1.6.12dfsg-6), apache2 (2.2.16-6+squeeze7) + mod dav_svn. I can't create a directory named "mysql" or "testmysql" or add and commit a file named "mysql.txt" in my repository. There are many references to "subversion PROPSET 403… >>> More
Using AuthzSVNAccessFile for controlling SVN Access produces HTTP 400 Bad Request

as seen on Server Fault - Search for 'Server Fault'
I have a new repository on an existing subversion server that requires us to perform path based authorization within the repository. I found that the AuthzSVNAccessFile directive in apache is directly responsible for allowing this functionality. After fixing several other problems such as AuthzSVNAccessFile… >>> More
Multi Svn Repositories in Apache

as seen on Server Fault - Search for 'Server Fault'
I have a set up with apache and subversion In the apache configuration i have <Location /svn> DAV svn SVNParentPath c:/svn </Location> Now i have multiple repositories a a_b a_c a_b_c a_b_d b and i want to map them as a/svn a/b/svn a/c/svn a/b/c/svn a/b/d/svn b/svn to do… >>> More
SVN Error 403 Forbidden

as seen on Stack Overflow - Search for 'Stack Overflow'
I can't figure this out. I try to import a new project into a svn repository from Netbeans and get 403 Forbidden. I just setup svn on my serverbox today. I can get to it through a browser just fine, though its empty as I haven't imported my project yet. Apache's path for html files is /var/www I… >>> More

Related posts about tortoisesvn

TortoiseSVN svnadmin

as seen on Stack Overflow - Search for 'Stack Overflow'
Currently im setting up TortoiseSVN and reading through docs etc. The manual often mentions svnadmin. I figured out, that I have to download it seperatly. But the link seems to be old. After some browsing I got here. But I can't find a version 1.6.7, like my TortoiseSVN installation. Also I'm a little… >>> More
TortoiseSVN icons not showing up under Windows 7

as seen on Stack Overflow - Search for 'Stack Overflow'
I can't seem to get the icons to display under Windows 7 and I really miss this from Windows XP. How can it be fixed? >>> More
TortoiseSVN commit shortcut

as seen on Stack Overflow - Search for 'Stack Overflow'
I find it tedious when everytime I need to commit a file.The process goto windows explorer window, right click directory, then click 'Commit'... and then the tortoisesvn commit window. Anyone know of any shortcut to do this? Maybe press a keyboard shortcut to commit instead of having to right click… >>> More
Different SVN Serverversions and Clients

as seen on Server Fault - Search for 'Server Fault'
Hi, we are going to migrate from CVS to SVN using subversion 1.6. But also we have another SVN-Server using subversion 1.2 (no chance to update). So we plan to use the newer TortoiseSVN 1.6.x Is it possible to use two different servers while using only the new TortoiseSVN? Another solution may… >>> More
TortoiseSVN overlay icons do not appear when installed by a different user account?

as seen on Super User - Search for 'Super User'
I've installed TortoiseSVN on my work Windows XP machine as the administrator. When I login in as a standard user my working copies do not display the overlay icons in Windows Explorer. I found this on TortoiseSVN's support pages: Did you install TortoiseSVN as a different user under WinNT/Win2K/WinXP … >>> More