Re: A couple thousand mp3 files (this is not spam I swear )

2016-08-12 Thread Chris Carman
On Fri, Aug 12, 2016 at 8:56 PM, Adam Jensen wrote: > Here's the situation: I have ~1500 mp3 files (not pirated music), and > the collection is growing. The sizes range from ~100kB to ~300MB. The > content of these files will never change. The directory structure will > change, files will be move

A couple thousand mp3 files (this is not spam I swear )

2016-08-12 Thread Adam Jensen
Hi, I am considering a use of Subversion as a means to avoid accidentally deleting some important files that I will be working with on a regular basis. I am very interested to get comments on my plan or suggestions for alternative methods. Here's the situation: I have ~1500 mp3 files (not pirated

Re: Tree conflict problem when merging two branches

2016-08-12 Thread André Roy
Hi Ryan, I'm interfacing using TortoiseSVN, so I cannot really provide a transcript. Those are however the exact sequence of events that will reproduce the conflicts. André On Fri, Aug 12, 2016 at 3:20 PM, Ryan Schmidt < subversion-2...@ryandesign.com> wrote: > > > On Aug 12, 2016, at 3:00 PM

Re: Tree conflict problem when merging two branches

2016-08-12 Thread Ryan Schmidt
> On Aug 12, 2016, at 3:00 PM, André Roy wrote: > > Hi all, > > First time posting. > > -Create a repository (trunk/tags/branches), > -Checkout /trunk, > -Create branch1 in /branches/branch1, and checkout. > -Create and checkout branch2. > -Create file.txt in Trunk + add + commit. > -Me

Tree conflict problem when merging two branches

2016-08-12 Thread André Roy
Hi all, First time posting. -Create a repository (trunk/tags/branches), -Checkout /trunk, -Create branch1 in /branches/branch1, and checkout. -Create and checkout branch2. -Create file.txt in Trunk + add + commit. -Merge trunk changes into branch1 and commit. -Merge trunk changes into branch2 and

RE: Blank line in historic svn:mergeinfo

2016-08-12 Thread Grierson, David
Many thanks for your assistance with this - this was likely introduced due to an old client applying a change to the svn:mergeinfo property which had not received the fix to http://subversion.tigris.org/issues/show_bug.cgi?id=3896 I followed something pretty much along the lines of the process w

Re: Issue report

2016-08-12 Thread Andreas Stieger
Regardless:   Compare the commits: https://sourceforge.net/p/tortoisesvn/code/27283   tags the release https://sourceforge.net/p/tortoisesvn/code/27284 commits a build fix to trunk https://sourceforge.net/p/tortoisesvn/code/27285applies the build fix to the tag   As such, never mind, you have the

Re: Issue report

2016-08-12 Thread Stefan Hett
Hi Mike, On 8/10/2016 10:31 PM, Faynberg, Mike wrote: Dear Madam/Sir, I was trying to update the TortoiseSVN on my Win7/32-bit computer. The installer I have is 1.9.4 Build 27285 (see the screenshot below): [..] However upon the installation – and rebooting the computer, the installed s