Re: Tree conflict: local add, incoming add upon merge

On Wednesday 04 August 2010, Tyler Roscoe wrote: > On Wed, Aug 04, 2010 at 03:44:24PM +, Mark Wakim wrote: > > There are no code changes between myDirectory in trunk and BranchX. > > Why am I getting this conflict? I thought svn copy was the proper way > > to copy files/directories between bra

Re: Recovering repository with multiple missing rev/ files

On Jul 30, 2010, at 6:41 PM, Stefan Sperling wrote: > On Fri, Jul 30, 2010 at 03:43:12PM -0400, Eiren Smith wrote: >> 2. Copied revision revs/7/7263 file from that dumpfile-backup-based repo >> into my production repo (the one missing some revs/ files -- I'll call it my >> corrupt repo). > > Co

Improving checkout performace Opções

Hi all. Does anyone knows how I could improve my checkout performace on WinVista/WinXP? I can checkout the repository using Win7 with no problem, but it's impossible using WinVista/WinXP. It's so slow. I'm using "keyword:rev" property and it's creating files to control the property, and I guess

Re: undefined symbol: REP_CACHE_DB_SQL

Alexander Skwar wrote on Wed, Aug 04, 2010 at 21:23:50 +0200: > Hi. > > 2010/8/4 Daniel Shahaf > > > No.  That file is auto-generated from libsvn_fs_fs/*.sql (IIRC, by > > build/transform_sql.py). > > > > (And, apparently, the autogeneration mechanism has changed, since in trunk > > I get > > >

Re: undefined symbol: REP_CACHE_DB_SQL

Hi. 2010/8/4 Daniel Shahaf > No.  That file is auto-generated from libsvn_fs_fs/*.sql (IIRC, by > build/transform_sql.py). > > (And, apparently, the autogeneration mechanism has changed, since in trunk I > get > > % grep REP_CACHE_DB_SQL .../subversion/libsvn_fs_fs/*h > src/svn/trunk.d/subversi

svn diff working copy against a different branch

Hi all, I have a system where there is a "trunk" and a branch called "branchX". I have checked out branchX and merged the trunk code into branchX on my working copy. I am trying to diff my working copy against trunk like so: svn diff --old=http://path-to-dir/myDirectory --new=myDirectory

RE: Tree conflict: local add, incoming add upon merge

Thanks, deleting the conflicting files then merging worked perfectly. I'll definitely use svn merge instead of svn copy in the future! Mark > Date: Wed, 4 Aug 2010 09:23:05 -0700 > From: ty...@cryptio.net > To: mark_...@hotmail.com > CC: users@subversion.apache.org > Subject: Re: Tree confli

Re: svn command line client - url encoding

Glen Pike wrote on Wed, Aug 04, 2010 at 11:07:19 +0100: > If I use the command line: > > svn co "https://ea_repos/svn/blender/trunk/Py modules, xls [latest > ver]/" > > I get the response: > > svn: URL > 'https://ea_repos/svn/blender/trunk/Py%20modules,%20xls%20[latest%20ver]/'

Re: undefined symbol: REP_CACHE_DB_SQL

Alexander Skwar wrote on Wed, Aug 04, 2010 at 17:33:23 +0200: > In ./subversion/libsvn_fs_fs/rep-cache-db.h, there's: > > #define rep_cZche_db_sql \ > "pragma auto_vacuum = 1; "\ > "create table rep_cache (hash text not null primary key, "\ > > "rep_cZche_db_sql"? cZche? Is that correct? > >

Re: Tree conflict: local add, incoming add upon merge

On Wed, Aug 04, 2010 at 03:44:24PM +, Mark Wakim wrote: > I am working on a project where we have trunk, and a branch which I > will call BranchX. A couple weks ago I added a directory > (myDirectory) to trunk, I then did an svn copy to add that directory > to BranchX. The best way to get cha

Tree conflict: local add, incoming add upon merge

Hi all, I am working on a project where we have trunk, and a branch which I will call BranchX. A couple weks ago I added a directory (myDirectory) to trunk, I then did an svn copy to add that directory to BranchX. I am now merging the latest changes from trunk into BranchX, but I am getting a

undefined symbol: REP_CACHE_DB_SQL

Hello. I'm now trying to compile Subversion 1.6.12 on a Solaris 10 system. It fails :( /bin/bash /export/home/webservd/Source/subversion-1.6.12/libtool --tag=CC --silent --mode=compile cc -DSOLARIS2=10 -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_LARGEFILE64_SOURCE -g -g -I./subversion/include -

svn command line client - url encoding

Hi, I have encountered a problem with the URL encoding for repository names when using the command line client. If I use the command line: svn co "https://ea_repos/svn/blender/trunk/Py modules, xls [latest ver]/" I get the response: svn: URL 'https://ea_repos/svn/blen

Re: Moving NAS owner and upgrading?

On Monday 02 August 2010, Christopher Nagel wrote: > I think I'll let the existing repository's mounted space go back into the > pool and just reserve a new one for the new repos, this way both can be > active at the same time. That'll make things more straightforward. That doesn't sound like a g