Re: Exclude a directory from a copy.

On Jun 22, 2011, at 21:01, Gavin Baumanis wrote: > Hi there everyone, > > I am just wondering if there is a short-hand way of excluding a directory > from a copy? > > I am wanting to create a branch from the trunk - but omit a specific > directory from the copy as it contains about 1GB of bin

Exclude a directory from a copy.

Hi there everyone, I am just wondering if there is a short-hand way of excluding a directory from a copy? I am wanting to create a branch from the trunk - but omit a specific directory from the copy as it contains about 1GB of binary data that are not required for the work that will be occurri

Re: Evil UTF-8 Character in filename in repo causing issues on my wc

On 2011-06-22 19:34:08 +0200, Stefan Sperling wrote: > On Wed, Jun 22, 2011 at 07:09:22PM +0200, Andreas Krey wrote: > > In my opinion it would be saner nowadays to assume file names to > > be in utf8 and warn if they are not, and use the setting in LANG > > for console I/O only. > > This strategy

Re: Lost work due to non-cummutative merges

I used a recent-ish trunk build. Daniel Shahaf wrote on Thu, Jun 23, 2011 at 03:03:05 +0300: > I also expected step 4 to conflict, and I also don't get a conflict: > > [[[ > 9,% ./new.sh > ### Making a Greek Tree for import... > ### Done. > > ### Importing it... > > Committed revision 1. > ###

Re: Evil UTF-8 Character in filename in repo causing issues on my wc

On 2011-06-22 16:28:31 +0200, Stefan Sperling wrote: > On Wed, Jun 22, 2011 at 03:42:42PM +0200, Vincent Lefevre wrote: > > On 2011-06-15 12:29:37 +0200, Stefan Sperling wrote: > > > Unicode, and it's quirk of allowing the *same* character to be encoded > > > in *different* ways, came much later. >

Re: Possible bug in SVN server with MIME formatted files

Can't reproduce with either neon or serf. 9,% $svn add recover.eml A recover.eml 9,% $svn ci -madd Adding recover.eml Transmitting file data . Committed revision 2. 9,% $svn up Updating '.': At revision 2. 9,% echo>>iota 9,% $svn ci -mappend Sendingiota Transmitting file d

Re: Lost work due to non-cummutative merges

I also expected step 4 to conflict, and I also don't get a conflict: [[[ 9,% ./new.sh ### Making a Greek Tree for import... ### Done. ### Importing it... Committed revision 1. ### Done. 9,% cd wc1/trunk/ 9,% $svn cp -q A A2 9,% $svn ci -q -m branch 9,% :>A/mu 9,% $svn ci -q -mrm A 9,% $svn up

Re: Possible bug moving file and then deleting directory

It seems this behavior has changed in 1.7 (to be released soon). It will no longer flag this as a tree conflict. See http://subversion.tigris.org/issues/show_bug.cgi?id=3526. AFAICS, the case described here is similar to the one described in issue #3526. Patrick, if you have some time, maybe you

Re: How to setup SVN with HTTPS on Apache for Windows?

Thanks guys and I apologize if you guys got my double-post. That was a user-error. - Robert Dailey On Wed, Jun 22, 2011 at 3:46 PM, Geoff Hoffman wrote: > Get everything working as a regular http://server/svn/repo then get a cert > or self sign (not related to svn) and move your vhost t

Re: How to setup SVN with HTTPS on Apache for Windows?

Get everything working as a regular http://server/svn/repo then get a cert or self sign (not related to svn) and move your vhost to port 443 (open that port on your firewall if applicable).

Re: Possible bug moving file and then deleting directory

See http://subversion.apache.org/faq.html#self-tree-conflict On Wed, Jun 22, 2011 at 4:04 PM, Patrick Quirk wrote: > ** > > I’ve run into this issue the past few days and I don’t feel like this is > expected behavior. I’m using client version 1.6.17 (Collabnet binaries).* > *** > >

Re: How to setup SVN with HTTPS on Apache for Windows?

The manual is always a good place to start: http://svnbook.red-bean.com/nightly/en/svn.serverconfig.httpd.html Cheers, Rob On Wed, Jun 22, 2011 at 1:59 PM, Robert Dailey wrote: > I currently run a Windows 2008 R2 server and I want to host SVN 1.7 on my > Apache installation, provided by XAMPP

How to install Subversion in Apache on Windows?

I am currently running Windows Server 2008 R2 and I have Apache installed on it through XAMPP. Is there a simple tutorial that shows how to install either SVN 1.6 or 1.7 into my existing version of Apache? Ideally I'd like to use the https protocol with SVN to access my repository. Thanks in ad

Lost work due to non-cummutative merges

Hi, we have the following situation: 1. A branch is created from trunk. 2. In trunk a line of code is added and commited as revision X 3. The line is removed again and commited as revision X+1 4. In branch changeset X+1 is merged from trunk 5. In branch changeset X is merged from trunk. The pro

How to setup SVN with HTTPS on Apache for Windows?

I currently run a Windows 2008 R2 server and I want to host SVN 1.7 on my Apache installation, provided by XAMPP. Is there an easy to follow step by step process I can follow to set this up? If not, can someone run me through the basics? - Robert Dailey

Re: Evil UTF-8 Character in filename in repo causing issues on my wc

On Wed, Jun 22, 2011 at 07:09:22PM +0200, Andreas Krey wrote: > In my opinion it would be saner nowadays to assume file names to > be in utf8 and warn if they are not, and use the setting in LANG > for console I/O only. This strategy may work well for applications starting out today. but it won't

Re: Backporting features from trunk to 1.6.x

On Wed, Jun 22, 2011 at 07:25:13PM +0300, Daniel Shahaf wrote: > Stefan Sperling wrote on Tue, Jun 21, 2011 at 13:52:37 +0200: > > The backports simply fall under the terms of the old licence when > > they get released. But then again, the project owns copyright to > > these changes in the first pl

Re: Evil UTF-8 Character in filename in repo causing issues on my wc

On Wed, 22 Jun 2011 16:28:31 +, Stefan Sperling wrote: ... > Subversion is internally converting path names from the native encoding Except that LANG isn't *the* native encoding. It is at least debatable whether it should be used to interpret file system name strings. (And it's rather hacked,

Re: Backporting features from trunk to 1.6.x

Stefan Sperling wrote on Tue, Jun 21, 2011 at 13:52:37 +0200: > The backports simply fall under the terms of the old licence when > they get released. But then again, the project owns copyright to > these changes in the first place :) The project does not own the copyright to an individual patch t

Re: Evil UTF-8 Character in filename in repo causing issues on my wc

On Wed, Jun 22, 2011 at 03:42:42PM +0200, Vincent Lefevre wrote: > On 2011-06-15 12:29:37 +0200, Stefan Sperling wrote: > > Unicode, and it's quirk of allowing the *same* character to be encoded > > in *different* ways, came much later. > > > > I think it is unfortunate that Apple broke with the c

Re: Evil UTF-8 Character in filename in repo causing issues on my wc

On 2011-06-15 12:29:37 +0200, Stefan Sperling wrote: > Unicode, and it's quirk of allowing the *same* character to be encoded > in *different* ways, came much later. > > I think it is unfortunate that Apple broke with the concept that a > filename is just a string of bytes. It's also unfortunate

Re: a question about "svn merge"

On Wed, Jun 22, 2011 at 04:36:17AM -0400, boying...@emc.com wrote: > Hi, All, > > I use "svn merge ^trunk" to merge changes to my branch. > > I found one file that shows no conflict but actually the changes were > not added to this file at all. > > The subversion I use is 1.6.12. Is is a known

a question about "svn merge"

Hi, All, I use "svn merge ^trunk" to merge changes to my branch. I found one file that shows no conflict but actually the changes were not added to this file at all. The subversion I use is 1.6.12. Is is a known issue or a new bug? Thanks Boying

Re: TortoiseSVN error

On Tue, Jun 21, 2011 at 03:27:38PM -0700, Rich Clingman wrote: > Exception while Reverting to earlier Revision. The intervening revisions had > tree conflicts that had been resolved by replacing. Reverting to have another > go at it. > > Subversion reported the following: > > In file > 'D:\De