Re: Reintegrate Merge causing tree conflicts after revert?

On Fri, Apr 09, 2010 at 11:06:57AM -0700, thinkpipes wrote: > Hello, > > --- PROBLEM > Using the --reintegrate option, merging the same two branches twice > (from reverting 3 merged files after the first merge) causes many > non-existent tree conflicts, along with text conflicts, after the > secon

Re: '@' character in file names

Hi Aaron, This is the way you're 'supposed' to refer to filenames that have the "@" symbol in them without using the peg revision syntax. The book talks about it here: http://svnbook.red-bean.com/nightly/en/svn.advanced.pegrevs.html The relevant paragraph is roughly 2/3 of the way down the page, s

Reintegrate Merge causing tree conflicts after revert?

Hello, --- PROBLEM Using the --reintegrate option, merging the same two branches twice (from reverting 3 merged files after the first merge) causes many non-existent tree conflicts, along with text conflicts, after the second merge. --- DESCRIPTION I had to merge branch A into branch B. So, I ch

'@' character in file names

We have an application that creates file names that contain the '@' symbol and, in the latest upgrade of svn, we noticed that there seems to be a conflict with the '@' sign used for the peg revision number when trying to add or commit these files. Currently, we are running version 1.6.9 as dis

Re: Getting started with Subversion.

On Thu, Apr 8, 2010 at 9:01 PM, Thomas Garrod wrote: > OK, I'm a complete rube. I don't know the second thing about Subversion (I > know it is version control). I need Subversion, and I don't know where to > start. Here are a few facts: > > Are you creating a Subversion repository, or just using

Re: I can't make BDB FS(version

It is very possible that the BDB libraries aren't on your machine. At one time, the Berkeley Database Libraries were standard issue on Unix style systems, but like much of the Unix world, it was never implemented in the base Windows OS. (This isn't a rag against Windows. It's that many Unix style s

Re: Getting started with Subversion.

On Apr 8, 2010, at 20:01, Thomas Garrod wrote: > OK, I'm a complete rube. I don't know the second thing about Subversion (I > know it is version control). I need Subversion, and I don't know where to > start. Here are a few facts: > > 1. I have a foundation. > 2. I need collaborators to be abl

RE: Getting started with Subversion.

> Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447 -Original Message- > From: Thomas Garrod [mailto:whidbeyto...@gmail.com] > Sent: 09 April 2010 02:01 > To: users@sub