Re: SVN patch IGNORES file without newline at end of file

2012-10-16 Thread Joshua Woodward-Clarke
I just tried it and can confirm that I am getting the same issue. (I am fairly new to SVN so I may have done somthing wrong) I am running Win XP SP3. I downloaded the files and tried applying the patches. I tried with with the TortoiseSVN "apply patch" and "svn patch" from the command line. Bot

Re: unexpected tree conflict on merge for same source file

2012-10-16 Thread Stefan Sperling
On Tue, Oct 16, 2012 at 06:02:55PM +0200, Stefan Sperling wrote: > If you really must merge between unrelated branches, use the 2-URL > merge syntax instead of the 'svn merge ^/foo' short-hand syntax and > specify revisions for each of the 2 URL arguments to merge meaningful > changesets. For insta

Re: unexpected tree conflict on merge for same source file

2012-10-16 Thread Stefan Sperling
On Tue, Oct 16, 2012 at 01:17:40PM +0200, Sven Uhlig wrote: > Below is a .bat file for creating the repo with some more conflicts that > we do not understand. I would be happy if someone could explain these as > well. Please see my remarks below. > @REM testsvn.bat > > cls > > svn --version > @

Multiple server configuration question

2012-10-16 Thread Sean Kuyk
Is the following setup feasible : Subversion server 1 with Subversion 1.6.18 served by Apache, Subversion server 2 with Subversion 1.7.7 served by Apache A repository can only be accessed via one of the servers ie. the same repository would not be accessible via both. Repositories exist on rep

unexpected tree conflict on merge for same source file

2012-10-16 Thread Sven Uhlig
Hello, imagine the following repository structure: /branches/prj1/first.txt /branches/prj1/second.txt /branches/prj2/first.txt /branches/testing/first.txt /branches/testing/second.txt /trunk/first.txt All first.txt in /branches/* are from the same /trunk/first.txt The file was only changed in /t

Re: Merging repositories => UUID conflict

2012-10-16 Thread Jan Keirse
On Mon, Oct 15, 2012 at 5:44 PM, Thorsten Schöning wrote: > Guten Tag Jan Keirse, > am Montag, 15. Oktober 2012 um 16:08 schrieben Sie: > > > However, when I try to svn relocate the working copies from > > repository B to repository A because the UUID is different between > > the 2 servers. I had

Re: accesing repository from another computer

2012-10-16 Thread Daniel Shahaf
Please do not CC individual persons on your questions; address them to the list only. Carmit Shiran wrote on Tue, Oct 16, 2012 at 09:32:57 +0200: > Hi there, > I installed the TortoiseSVN locally on my computer. > Now I want to access files in my repository from a different computer. > How can I d

Re: accesing repository from another computer

2012-10-16 Thread Thorsten Schöning
Guten Tag Carmit Shiran, am Dienstag, 16. Oktober 2012 um 09:32 schrieben Sie: > Now I want to access files in my repository from a different computer. You already created a thread: http://svn.haxx.se/users/archive-2012-10/0074.shtml Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Sch

accesing repository from another computer

2012-10-16 Thread Carmit Shiran
Hi there, I installed the TortoiseSVN locally on my computer. Now I want to access files in my repository from a different computer. How can I do it without setting a server? I'm the only one working on this repository. It's on ny local computer. I want to access files in that repositpry from anoth