Re: empty parent infinite child

2012-11-09 Thread Daniel Shahaf
Well, yes. The "empty" depth on the parent means, for example, that if another working copy creates and commits a new child, 'svn up' won't pull it. Note the reverse problem can also happen: a depth=immediates parent and a depth=exclude child. So, yes, it's by design. Maybe we could change the

error: Revision file lacks trailing newline

2012-11-09 Thread Alexander Shenkin
Hello Folks, I was getting an error while trying to checkout a directory, and some investigation with VisualSVN's server manager turned up an error in a couple of files ("Corrupt node-revision '5-2893.0.r2893/0' Missing id field in node-rev"). I then ran svnadmin verify, and got the following:

Re: svn conflict, svn info message incorrect?

2012-11-09 Thread Kiren Pillay
Hi Stefan, Thanks for the help! Regards Kiren On Fri, Nov 9, 2012 at 2:40 PM, Stefan Sperling wrote: > On Fri, Nov 09, 2012 at 10:44:57AM +0200, Kiren Pillay wrote: > > "--reintegrate" merge has worked like a charm for us so far, however the > > reason I didn't do a reintegrate merge was tha

Re: svn conflict, svn info message incorrect?

2012-11-09 Thread Stefan Sperling
On Fri, Nov 09, 2012 at 10:44:57AM +0200, Kiren Pillay wrote: > "--reintegrate" merge has worked like a charm for us so far, however the > reason I didn't do a reintegrate merge was that this was our QA branch, so > if I reintegrated, I would have to delete the QA branch and recreate it, > since af

AW: Two questions about svn log of a deleted file

2012-11-09 Thread Niemann, Hartmut
Hello Stefan, thank you for your answer, thinks are slowly getting clear. > > > > I deleted a file a.txt in revision 1186. > > [...] > > > > svn log a.txt@1100 gives me the history up to rev. 1100 > > svn log a.txt@1185 gives me the history up to rev. 1185 > (which ends at rev 1132, no newe

empty parent infinite child

2012-11-09 Thread James French
Hi, If I update a folder with -set-depth=empty and then update a child folder with -set-depth=infinity the parent is still reported as having empty depth by svn info. This is with svn 1.7.6. Is this by design? Seems weird to me... James

Re: SVN Usage Questions

2012-11-09 Thread Ulrich Eckhardt
Am 08.11.2012 23:39, schrieb Ahmed, Omair (GE Oil & Gas): I am looking for some guidance on where to store build artifacts in SVN. Generally, the advise is not to store build artifacts. Compiled binaries can't be merged or diffed meaningfully, which makes them "dead ends" as far as their hand

Re: svn conflict, svn info message incorrect?

2012-11-09 Thread Kiren Pillay
Hi Stefan, You are correct, it was not a reintegrate merge, and it was from our QA branch back into trunk. What I found out was that my colleague had already merged the code in that I was merging. So I assumed that the mergeinfo would have hinted that this was already merged and no conflict would