when to use svn copy

2011-01-25 Thread JamieEchlin
What are the acceptable cases for using svn cp? Superficially, it can be used for creating branches or tags, and indirectly as part of a move/rename operation, and restoring a deleted file/dir, but are they any other justified usages? What we see a lot of, and are considering blocking going forw

Re: examining repository for files that only I have changed

2011-01-21 Thread JamieEchlin
Woodworth, James wrote: > > Over the past three weeks I have changed and committed some files. I > need to somehow recurse through the directories and show me only the > files I have changed. How do I do this? > Install TortoiseSvn. Fire up the log for the repo. Pull down the magnifying gla

Re: how to find out from where a file has been copied

2011-01-21 Thread JamieEchlin
Stefan Sperling-7 wrote: > >> This would be lovely, and is what we're aiming for using tortoise >> pre-commit >> hooks and server hooks, although in a bit of a spit-and-sawdust way at >> the >> moment. > > I'd like to hear how that turns out. > > Will you be allowed to share these hooks under

Re: how to find out from where a file has been copied

2011-01-21 Thread JamieEchlin
Stefan Sperling-7 wrote: > > It would be even nicer if Subversion had a way of guiding users to > perform merges in accordance with a pre-defined strategy. > So if the user tried to perform e.g. a cherry-picking merge to a branch > for which cherry-picking isn't defined in the strategy, svn wou

Re: how to find out from where a file has been copied

2011-01-21 Thread JamieEchlin
Stefan Sperling-7 wrote: > > There is nothing that tells you this information directly. > The changes brought in by a merge are treated just like any other > local changes. As far as Subversion is concerned, you could have made > any merged changes manually. > > Defining a good branching/mergi

Re: how to find out from where a file has been copied

2011-01-21 Thread JamieEchlin
Stefan Sperling-7 wrote: > >> How do I see if file "a" came from 1 or from 2? >> How do I see from which revision of file 3 came file c? >> >> After the check-in, it's clear: svn log will show it. >> >> How do I review (if it's ok what I did) BEFORE checking-in? > > svn info a | grep ^Copied

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread JamieEchlin
Stefan Sperling-7 wrote: > > > This cannot happen during merge though, so the help text for merge > shouldn't be listing it. > It happens all the time?! You merge changelists that contain added files, however the file can't be added because an unversioned file with the same path already exis

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread JamieEchlin
> What is "Existed"? Christian Unger-7 wrote: > > > it's gone now :-) > Hrm, I was hoping that it meant Existed as in existed before the merge was started, and thus corresponds to a "skipped" file. So that users could see that files had been "skipped" if they had missed it in the merge outpu

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread JamieEchlin
G means merGed by the way, however it would be good to see docn for the letters for tree and property conflicts and everything else. -- View this message in context: http://old.nabble.com/Letters-at-beginnings-of-columns-of-svn-output-tp30714345p30718182.html Sent from the Subversion Users mail

Re: Letters at beginnings of columns of svn output

2011-01-20 Thread JamieEchlin
Stephen Butler wrote: > > On the command line, try > >svn help update > > (for instance). > > It's also in the SVN Book's command reference chapter, under > the given 'svn' subcommand: > There is docn for the letters for status and for update, but I haven't found anything for the output

Re: usage of svn_wc_diff

2011-01-11 Thread JamieEchlin
Daniel Näslund wrote: > > Hope, you'll be able to solve your problem. Here's a script that's a bit > more clean than the previous one. I haven't tested it much at all but it > appears to be able to display added, modified and deleted properties set > on both dirs and files. The '###' lines repre

Re: annotate/log mergeinfo

2011-01-11 Thread JamieEchlin
Kylo Ginsberg-2 wrote: > > Does anyone have a script that will annotate and/or log mergeinfo. I.e. > I'd > like to: > * see all the log entries that modified svn:mergeinfo for a given node > (file > or directory) > * annotate the svn:mergeinfo for a given node, so I can see what > author/rev >

subversion client hooks - any advice?

2011-01-06 Thread JamieEchlin
Afternoon, Following a spate of high-profile subversion problems at my $client, we've decided to implement both client and server "sanity" hooks, which we're hoping will prevent most of the problems from happening again. I'm working on the client part at the moment, which will take the form of t

Re: 答复: svn: REPORT request f ailed on '/svn/!svn/bc/20890'

2011-01-06 Thread JamieEchlin
>> I am using svn1.6.3. I put all source code and documents of our >> team into one repo. It works great for two years until last month. Now >> when >> I run 'svn log http://192.168.0.3:907/svn' (where 192.168.0.3 is our >> server's address), svn returns 'svn: REPORT request failed on >>

Re: usage of svn_wc_diff

2010-12-13 Thread JamieEchlin
Seems to work perfectly! Thanks Daniel, that's exactly what I was looking for. jamie -- View this message in context: http://old.nabble.com/usage-of-svn_wc_diff-tp30399137p30445649.html Sent from the Subversion Users mailing list archive at Nabble.com.

Re: usage of svn_wc_diff

2010-12-08 Thread JamieEchlin
Daniel, thank you very much for that, that's incredibly helpful. It definitely gives me somewhere to start. cheers, jamie -- View this message in context: http://old.nabble.com/usage-of-svn_wc_diff-tp30399137p30413850.html Sent from the Subversion Users mailing list archive at Nabble.com.

Re: usage of svn_wc_diff

2010-12-08 Thread JamieEchlin
Cheers, but I was trying to avoid using the svn executable, as I said I can't rely on it being present. The trouble with the 41-line doc string is that it tells me how to use the function, but not what all batons etc I need to pass it, which I was having trouble working out. -- View this message

usage of svn_wc_diff

2010-12-07 Thread JamieEchlin
Hi, Firstly I hope this is the right forum, it doesn't seem appropriate for the dev forum. Has anyone got an example of using svn_wc_diff (or 2/3/4 etc), preferably from python? I can find zero examples on the interwebs. I can't work out what I need to pass from the minimal doxygen docs... Bas

RE: SVN Path Authorization

2010-12-02 Thread JamieEchlin
Ramesh Nadupalli wrote: > > What are the other characters supported in the apache authorization file > (AuthzSVNAccessFile)? Any documentation available? > > In case if there are any human errors in the authorization file, its > making > repository unavailable. Is there a tool/mechanism to c

Re: Status of SVNPathAuthz short_circuit

2010-11-30 Thread JamieEchlin
Bruno De Fraine wrote: > > Is my interpretation of "short_circuit" v.s. regular path-based > authorization correct? Or if not, what is the impact of "short_circuit"? > Since performance problems are so apparent with path-based authorization, > why is this seemingly useful option given so little

Re: Should svn allow a merge into a conflicted file?

2010-11-24 Thread JamieEchlin
Hi - I hate to bump this just for the sake of it, but AFAIK an email wasn't sent to the list from this post, maybe because I sent it immediately after registering. cheers, jamie JamieEchlin wrote: > > Should Subversion allow a merge on top of a file that already contains >