Re: Cannot checkout or clean up using 1.9 dev build

2015-04-28 Thread Benjamin Fritz
On Apr 28, 2015 8:02 AM, "Ivan Zhakov" wrote: > > > I've fixed at least one problem in svn_stream__install*() on Windows > with long path names in r1676526. > > But I was getting different error message on Windows 8.1. Benjamin, > what operating system do you use? > Windows 7

Re: Cannot checkout or clean up using 1.9 dev build

2015-04-27 Thread Benjamin Fritz
Apparently I'm not subscribed to get list emails; please CC me on future responses. I had to get this message from the archive :-) Branko Čibej wrote: > On 27.04.2015 18:06, Benjamin Fritz wrote: > > I get the following error when I try to check out a working copy from > > m

Re: Cannot checkout or clean up using 1.9 dev build

2015-04-27 Thread Benjamin Fritz
On Mon, Apr 27, 2015 at 11:06 AM, Benjamin Fritz wrote: > > svn: E155009: Failed to run the WC DB work queue associated with 'C:\Project_Files\Proj_Dev\Prog_svn_1.9_cmdline', work item 2160 (file-install 234 Logical_Architecture/APP/App_PL_Verification/XXX/XXX_XXXs/XXX_7_APPD

Cannot checkout or clean up using 1.9 dev build

2015-04-27 Thread Benjamin Fritz
I recently tried the nightly build from TortoiseSVN, with the following version information for the supplied command-line tools: svn, version 1.9.0-dev (under development) compiled Apr 27 2015, 03:09:52 on x86-microsoft-windows Copyright (C) 2015 The Apache Software Foundation. This software c

Re: Directory with tree conflict lies about merge result

2014-08-06 Thread Benjamin Fritz
On Wed, Aug 6, 2014 at 1:00 PM, Stefan Sperling wrote: > The server keeps sending adds for the paths. > It has no idea the client cannot use them. > > Note how the As you're asking about appear in the tree-conflict column, > not in the first column as normal adds do. They allow you to see what > t

Re: Directory with tree conflict lies about merge result

2014-08-06 Thread Benjamin Fritz
On Wed, Aug 6, 2014 at 12:14 PM, Andreas Stieger wrote: > Hello, > > I recommend the following: > In a clean working copy of the feature branch... > svn mv host host_branch > Then perform the merge, now without tree conflict. > svn mv host_branch/test host/ > svn rm host_branch > Thanks! That got

Directory with tree conflict lies about merge result

2014-08-06 Thread Benjamin Fritz
I accidentally created a "host" directory both on a feature branch, and on trunk. On trunk, this directory contains a "lib" subdirectory containing a project to build a Windows version of the library I'm developing. On the feature branch, this directory instead contains a "test" directory containin

How to see all history of a deleted file without knowing the exact last revision?

2014-07-16 Thread Benjamin Fritz
Actually, I was looking to answer this question on stackoverflow: http://stackoverflow.com/questions/24766535/how-to-tell-what-revision-a-folder-was-deleted-in The person was asking how to find the revision a folder was deleted in, and they knew some really old revision where the folder was defini

Getting the last changed revision of a file including ancestry

2014-06-04 Thread Benjamin Fritz
At work, when we release our software, we need to record the last time each file in our project has changed, and compare that to the last revision where we recorded a peer review of that file. I need to get the last actual change to a file, ignoring renames and copies that didn't modify the file co

File externals into another external

2014-04-23 Thread Benjamin Fritz
I had a problem at work, where somebody created a tag for a library, and then deleted a bunch of files I needed from that tag. When I updated my svn:externals definition in my application to pull in the new library version, those files went away. I tried to fix it in my application, by creating fil

Reverse blame?

2014-01-07 Thread Benjamin Fritz
I wanted to find the revision where a certain line got removed from a file. Taking a hint from "svn diff" and "svn merge", I tried doing an "svn blame" with the revision range backwards. I just get an error: svn: E195002: Start revision must precede end revision I see this was discussed before: h

Is it possible to see a diff of a "replaced" file?

2013-09-10 Thread Benjamin Fritz
I'm referring to files with an 'R' status in 'svn log'. I want to see the changes between the new file, and the file that it replaced. I can use 'svn cat' to get the old file and then compare it to the new one, but I am hoping there is a way to have SVN run the diff for me in one step like it can

Re: Managing "needs-lock" files on multiple branches

2013-06-13 Thread Benjamin Fritz
On Thu, Jun 13, 2013 at 3:09 PM, Mark Phippard wrote: > On Thu, Jun 13, 2013 at 4:05 PM, Benjamin Fritz > wrote: >> On Thu, Jun 13, 2013 at 2:47 PM, Mark Phippard wrote: >>> >>> The hook is running on the server, so it could access the repository >>> via

Re: Managing "needs-lock" files on multiple branches

2013-06-13 Thread Benjamin Fritz
On Thu, Jun 13, 2013 at 2:47 PM, Mark Phippard wrote: > > The hook is running on the server, so it could access the repository > via file:// URL to do the lock. This does not require authentication. > I DID NOT KNOW THIS! Is that documented somewhere? This should allow my pre-lock hook to work e

Managing "needs-lock" files on multiple branches

2013-06-13 Thread Benjamin Fritz
Where I work, we branch for every bugfix, to allow a "clean" trunk at all times. Some files we work with are not easily merged, so we have svn:needs-lock set on them. Locking one of these files is supposed to indicate to the rest of the team not to touch it until you're done (or at least, ask fir

Re: File external that worked fine in 1.6.x not working in 1.7.5

2012-07-26 Thread Benjamin Fritz
On Thu, Jul 26, 2012 at 2:10 AM, Johan Corveleyn wrote: > On Thu, Jul 26, 2012 at 1:57 AM, Ryan Schmidt > wrote: >> >> It's my understanding that file externals (which are a relatively new >> feature for Subversion) are implemented very very differently under the hood >> from directory external

Re: File external that worked fine in 1.6.x not working in 1.7.5

2012-07-25 Thread Benjamin Fritz
On Wed, Jul 25, 2012 at 5:07 PM, Johan Corveleyn wrote: > On Wed, Jul 25, 2012 at 6:23 PM, Benjamin Fritz > wrote: >> I have two repositories and I am using svn:externals to place a >> directory and a few files from one repository into a working copy of >> the other. &g

File external that worked fine in 1.6.x not working in 1.7.5

2012-07-25 Thread Benjamin Fritz
I have two repositories and I am using svn:externals to place a directory and a few files from one repository into a working copy of the other. I have the following two svn:externals definitions on a directory in my working copy for the repo-A repository: ^/../repo-B/tools/coverity/scripts script