"svn diff" works for added files in working copy, but not for previous revision

2010-07-28 Thread Bob
Hi, When I do "svn diff file1" on a file that I just added to my working copy since the last commit, it prints a diff that shows the entire file being added. However, if I had a file that was added in a previous revision (say 42), and I try to do "svn diff -c 42 file2", it doesn't work. It gives th

can i svn cat without keyword expansion

2010-08-06 Thread Bob
Hi, If I do "svn cat" on a file, with the svn:keywords property set, it expands out SVN keywords such as $Date$, $Revision$, $Id$, etc., in the file (the ones there were included in the svn:keywords property anyway). Is there an option that will NOT do the expansion? Or is there some other way of u

RE: Why doesn't 'svnadmin create' creates tags, branches, trunk?

2010-10-07 Thread Bob Archer
at file somewhere. After you create a repo you can do an svnadmin load --ignore-uuid < templatedumpfile (so you retain the unique uuid in the newly created repo). You can even create a batch/command for this to do it with one command. BOb

RE: svn Farm

2010-10-07 Thread Bob Archer
led and run it, looks good. > but now I need to find a way to link my ldap users to svn > roles/authz , > I still can't find how to do that wihout creating csvn local > accounts > for all my users :-( ... !? Oh man, I thought edge did that for you and provided a web UI to set it up. Which is why I was considering moving to it when 1.7 came out. Not so? BOb

RE: svn Farm

2010-10-08 Thread Bob Archer
command line client supports http(s) just fine. BOb

RE: User authentication\authorization upper-lower case

2010-10-08 Thread Bob Archer
d. Are you using svn or apache/http? Perhaps showing us your config file would help. I think authorization is only applied to authenticated users. BOb

RE: svn Farm

2010-10-08 Thread Bob Archer
> Le 08/10/2010 15:59, Bob Archer a écrit : > >> Now, is collabnet solution able to serve tradition unix shell > >> comand > >> line clients ? is there a svnserve server behind it or is apache > >> able to > >> serve those clients using svn protoc

RE: User authentication\authorization upper-lower case

2010-10-08 Thread Bob Archer
Bla' > >> user. > >> Thanks > >You probably have anon access allowed. Are you using svn or > apache/http? Perhaps showing us your config file would help. I > >think authorization is only applied to authenticated users. > > >BOb > > anon-access = n

RE: User authentication\authorization upper-lower case

2010-10-08 Thread Bob Archer
> On Fri, Oct 8, 2010 at 5:30 PM, Bob Archer > wrote: > > >> Hi all. I have a problem with SVN. I have the (only) user > > >> 'test_user' (in the 'passwd' file) having 'rw' on the entire > > >> repository. Why am I able to

RE: svndump filter: How to pretend files were added to trunk

2010-10-13 Thread Bob Archer
> Am I missing something ? Is there a tool to re-root a bunch of > files/directories that were not initially created within a 'trunk' > dir > ? > If you are putting this into the same repository why not just export the stuff then import it into the path you would like it to reside? This will begin the history for that new path. BOb

RE: Need advice on when to commit and how many commits to issue when multiple files changed

2010-10-13 Thread Bob Archer
thank you. Since "tagging" is usually done at the file level and it can take forever. Yes you get an difference rev number in svn when you "tag" but um... frankly I ignore the rev numbers in svn. TSVN makes that very easy to do. You'll get used to it quickly and probably prefer it too. BOb

RE: Managing modifications to an open source product

2010-10-14 Thread Bob Archer
idual files we modify and point to the modified > version that we could keep in our repository. My concern is we are > "overloading" the files in the MW repository with files in our > repository and I am not sure subversion allows that. > There is a whole section in the svn book about this... http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.advanced.vendorbr BOb

RE: can I checkout only a revision files ?

2010-10-20 Thread Bob Archer
useful... > > If you version and commit your classes, you need to get only > changed one to patch you application server. > That's why I need last committed files. > > > > > If that does not help, try rephrasing your question and/or > providing > > more background. My NAnt build scripts have a task that will create a "delta" of the changed deployables to create a hotfix for example. Just pulling out the changed stuff from svn wouldn't work anyway... since new binaries need to be built most of the time. BOb

RE: AW: German console output

2010-10-21 Thread Bob Archer
oint is, that people like me, or maybe just me at all ;-), > would > really appreciate an (semi-?)official download source where I can > just > download win32 binaries with all parts of Subversion, without > overhead > like Apache and ViewVC. > Collabnet's server install does have that. Just tell it not to install Apache. Is it DL size you are worried about? BOb

RE: AW: German console output

2010-10-21 Thread Bob Archer
quot;CollabNet Subversion Server and Client v1.6.13 (for > Windows)". > > I assume you have since found that download. It is still provided > and > updated with new releases. No.. where is it? I only see the Edge builds and the Command-line only build. Where is the server and client build? I am looking here: http://www.open.collab.net/downloads/subversion/ BOb

RE: Subversion 1.6.13 Released

2010-10-27 Thread Bob Archer
l have what they had before. It does have Apache but you can disable it on the installer and it won't be installed. http://www.open.collab.net/downloads/subversion/svn1.5.html BOb

RE: mergeinfo not inherrited when I thought it should

2010-10-29 Thread Bob Archer
; > See attachment for a reproduction scenario. > > Is this scenario supposed to be handled by SVN ? > We are in a corporate environment, using 1.5.1. Is the above > scenario known to be handled correctly in later versions? > Is it a known issue? There were many merge issues fixed after 1.5.1.. you should get to the latest 1.6... or at the very least the latest 1.5. BOb

RE: Moving repository across servers : storage format problem

2010-11-04 Thread Bob Archer
'3', > found format '4'") > > Seeing that, I completely deleted the repository that I just > copied, and I > tried again, creating a new empty repository and moving using > "svnadmin > dump" on the first computer, and "svnadmin load" on

Usage discrepancies between two relatively identical systems

2010-11-10 Thread Bob Bonifield
l grab the password from the /auth/svn.simple file and process the auth. The one that does not work properly will attempt to use `apache` as the user with no stored password. I've looked into the user .subversion directories on both machines, and things match up there. I'm stumped. Bob

Usage discrepancies between two relatively identical systems

2010-11-10 Thread Bob Bonifield
l grab the password from the /auth/svn.simple file and process the auth. The one that does not work properly will attempt to use `apache` as the user with no stored password. I've looked into the user .subversion directories on both machines, and things match up there. I'm stumped. Bob

RE: svnserve : anonymous access not working

2010-11-17 Thread Bob Archer
; file, and the > corresponding > line is : > > svn stream tcp nowait > www-data > /usr/bin/svnserve svnserve -i --log-file /var/log/svnserve.log > -r > /var/lib/svn > > I don't understand why it doesn't work. > > Isn't it enough to set "anon-access = read" for allowing anonymous > reading > access ? Are you using path based authorization too? BOb

RE: Managing users

2010-11-17 Thread Bob Archer
id you read the section on path-based authorization. It explains how to do exactly what you are asking about. http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.serverconfig.pathbasedauthz BOb

RE: svnserve : anonymous access not working

2010-11-17 Thread Bob Archer
> -Original Message- > From: Gingko [mailto:from_tig...@nospam.homelinux.org] > Sent: Wednesday, November 17, 2010 1:27 PM > To: Subversion User List > Subject: Re: svnserve : anonymous access not working > > > - Original Message - > > From:

Upgrade OS/400 from V5R4 to V7R1

2010-12-01 Thread Bob Nason
Hi... Any issues with Subversion jumping from release V5R4 to V7R1 of the iSeries OS/400? Thanks... Bob Robert Nason American Board of Pediatrics, Information Technology 111 Silver Cedar Court Chapel Hill, NC, 27514-1513 (919) 918.7107 Ext. 121 "Some people spend an entire lifetime wond

RE: question about *.merge-right.r*

2010-12-02 Thread Bob Archer
e file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository. Here OLDREV is the revision number of the file in your .svn directory, and NEWREV is the revision number of the repository HEAD. BOb

RE: Unable to lock error: what is going on here?

2010-12-02 Thread Bob Archer
I failing to understand here? Are you sure utscmd is not already versioned. Ignores only works on non-versioned files. BOb

RE: Unable to lock error: what is going on here?

2010-12-02 Thread Bob Archer
> On 12/02/2010 08:39 AM, Bob Archer wrote: > >> $ svn update > >> svn: Unable to lock 'utscmd' > >> > >> $ svn propget svn:ignore > >> utspkg_src > >> utscmd > >> utslib > >> utsbin > >> utstool

RE: Problem with svn merge --reintegrate

2010-12-07 Thread Bob Archer
st archives > that a svn merge --record-only (or a corresponding change of the > svn:mergeinfo properties) could fix the problem, but how do I find > out which revisions are affected (e.g. in which revisions the files > and directories were lost)? > Do you have a sparse checkout by any chance? Are you merging in at the same folder level from where you branched? BOb

RE: SVN Version upgrade.

2010-12-07 Thread Bob Archer
epository might possibly enhance > performance. Of course you can run svnadmin upgrade to bring the repository to version 1.6. If you don't it will keep storing stuff in the 1.5 format and you will lose many of the advantages of 1.6. BOb

RE: Problem with svn merge --reintegrate

2010-12-07 Thread Bob Archer
; > Do you have a sparse checkout by any chance? Are you merging > > in at the same folder level from where you branched? > > No, it's a normal checkout, and I was and am merging at the same > folder level (_dev) from where I branched. > > I noticed however that the mentioned files have been changed in > another branche and then were merged to trunk (within the given > range 13561-15003). Is this in some way helpful/important? Well... there you go. If there has been activity in the trunk since the branch was done, then you must merge trunk into branch before you can re-integrate back into trunk. Although, it seems strange that it would mention revision range that was prior to your branch being created. BOb

RE: tracking multiple "test" groups

2010-12-07 Thread Bob Archer
From: Coleman, Brandon [mailto:brandon.cole...@gohastings.com] Sent: Tuesday, December 07, 2010 2:38 PM To: users@subversion.apache.org Subject: tracking multiple "test" groups I currently use SVN with Feature branches that are tested, merged to trunk, compiled and then sent to a small group of

RE: Archiving Projects (End-Of-Life)

2010-12-13 Thread Bob Archer
aybe also in an "archive" > subdirectory, under tags). If it ever needs to be resurrected, it > can > be easily copied from that tag. > > Thoughts? Other ideas? Pros and cons? > Two options I can think of.. one simple, one will need admin access... 1. Create a folder in your repository named (end of life) and move the project folder there. 2. Dump the repository, use dumpfilter and import it into an "end of life" repository, then RM it from your main repo. BOb

RE: alternative to CVS magic branches

2010-12-16 Thread Bob Archer
you have 20 files and you > change > only a small number of them you only have to merge changes to the > files > you modified, the others always have changes in the trunk. > Is the only option in Subversion to merge the trunk to the branch > regulary Yes, pretty much. BOb

RE: svn 1.4.2 to 1.4.9

2010-12-16 Thread Bob Archer
sitory format. So, just put in the new binary and away you go. If you do go up to 1.5 or 1.6 then you can either do a dump / load sequence (usually recommended) or you can run svnadmin upgrade. > > Thanks for the help! BOb

RE: ignored files

2010-12-20 Thread Bob Archer
nt queries, I see the > documentation for other older versions of svn (1.4, 1.5), but I > don't see the docs for 1.6 or the nightly. > The nightly is basically for 1.6. http://svnbook.red-bean.com/nightly/en/svn-book.html BOb

RE: SVN BUG : Lines disappeared after update and check in

2010-12-21 Thread Bob Archer
has anyone experienced such a behavior? > If it truly is losing lines that would be a bug. However, what were the merged in changes? Are you sure the merge during the update didn't remove lines? BOb

RE: Looking to hire Software Engineers to Help Develop Subversion

2010-12-21 Thread Bob Archer
ect. > > I hope that WANdisco is able to fix many of the issues that have > been > plaguing Subversion for years. I don't believe that those who are > leading Subversion have "failed", but that a private company > committing resources to an open source project can be a good thing. > Absolutely correct! > > Your analysis / explanation is much better than my own. Thank you. > > - David I also think this is good news and look forward to seeing the WANDisco contributions to the project. And if I had any more knowledge of the svn internals I might be applying for one of those positions. BOb

RE: changing the structure of code in public repo

2010-12-22 Thread Bob Archer
re and > then commit ? > Or should I delete the directories from repo first? No, don't just delete then replace. Use the svn commands to do your refactoring. Basically the svn move command. Once you have done all your refactoring commit your changes. Have you read the free svn book? Specifically the "basic usage" chapter? BOb

RE: svnadmin create and not being method agnostic

2010-12-29 Thread Bob Archer
apabilities. v1.6 added logging to svnserve. > > On the other hand, when you start using Apache you've got a whole > 'nother pile of code that can have security holes in it...so it's > really a matter of which risk you're more concerned about. yep, 6 of one... BOb > -- > David Brodbeck > System Administrator, Linguistics > University of Washington

RE: svnadmin create and not being method agnostic

2010-12-30 Thread Bob Archer
ant a more "secure" version of subversion package up your own binaries that don't include svnserve... let the svn dev's work on the stuff that we can't do with 3 or 4 lines of a batch/command file. BOb

RE: svnadmin create and not being method agnostic

2010-12-30 Thread Bob Archer
it. I guess that applies to *Nix servers too. BOb

RE: svnadmin create and not being method agnostic

2011-01-11 Thread Bob Archer
tenation of separate "the admin > should set these if they want" options creates a quite noticeable > security risk. Yes, well aren't you still only keeping the honest people honest? Since svn is open source anyone can edit the code so the check of servers.conf is a no-op and it serves anyway. Why are you making your repository "readable" in the first place? BOb

RE: Merging in Subversion

2011-02-01 Thread Bob Archer
at if a fix is made in a version to a binary file, that same fix is applied to higher versions. This is usually an issue with reports since we use crystal the .rpt files are binary. It seems to work for us but may not work for others. If only every file could be textual... ;) BOb

RE: externals behavior with tags

2011-02-01 Thread Bob Archer
referenced item during development, one approach is to > always make an intermediate branch where you make these and any > other > needed changes before making the tag. Or, just make the changes on your working copy and create the tag from your working copy. BOb

RE: externals behavior with tags

2011-02-01 Thread Bob Archer
? I think a "where used" type function is > what im looking for. > There is also a tool called svncopy that will peg the externals for you. http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/svncopy/svncopy.README BOb

RE: Copy with externals, then commit fails

2011-02-01 Thread Bob Archer
l directory at any depth, and any missing intermediate directories will be created, file externals must be placed into a working copy that is already checked out." BOb

RE: Checkout really slow in Windows with lots of files in one directory

2011-02-02 Thread Bob Archer
hat this was a case where the > reading/parsing/writing > of our large entries file was causing a slowdown and moving to > SQLite > was going to bring performance gains. Clearly that is not the case > as > trunk is much slower. > > If I get another batch of free time I will try it with a lot of > small PNG's. Running Working Copies on RAM drives in Windows makes it fly like the devil. For anyone inclined to give it a try. Of course, you need some free RAM to be able to do it. I set up a 2GB RAM drive to try it. I was really trying to improve Visual Studio perf though, and not svn... so I don't use it any more. But, I did notice that all svn stuff was much much faster. I can't recall the software I tried. BOb

RE: Error on Post Commit Hook.BAT

2011-02-02 Thread Bob Archer
the email will be sent automatically. This is probably easier that finding some program that uses the SMTP protocol... tHis assumes the credentials running your batch has permissions to the pickup folder on the SMTP server of course. BOb

RE: File already exists Error with Subversion 1.6.12

2011-02-03 Thread Bob Archer
ad will not create a repository. You are loading into an empty repository? 2. Try the command without the trailing slash on the repository path... all the example I see don't use it, and I also don't put it when I have done loads. BOb

RE: Importing a git repos to subversion

2011-02-03 Thread Bob Archer
> I think you can use git-svn to push a git repo to an svn repo. BOb

RE: Request for comments on our vendor library structure

2011-02-08 Thread Bob Archer
ve space is cheap. I would rather have all the dependencies for each project in my working copy. Sure, store it once in the repository and use externals in your projects. Once again, this is all preference, and I just gave you mine. Only you can decide what is right for you. BOb

RE: svnadmin create complains about subrepositories

2011-02-10 Thread Bob Archer
witch to > still being able to create Repositories within the path of another? I guess my question would be "why do you want to do that"... and I would also say DON'T do that. Bob

RE: svnadmin create complains about subrepositories

2011-02-10 Thread Bob Archer
u can't nest repos nor should you need to. > > @Stefan: I have no idea what the former Version was, but I upgraded > from debian Lenny to squeeze so it was probably 1.5.1. > > Would it hurt to add a force switch? I mean its at the users risk > isnt > it? > Yes, it would hurt. This is like saying, I want to create a mySQL database inside my current mySQL database... why can't I do that? BOb

RE: svnadmin create complains about subrepositories

2011-02-11 Thread Bob Archer
t that has child sub-project I really really want them to be in the same repository. Actually, I put all my projects in the same repository so I can browser them in "some" repository browser like T-SVN of ViewVC. We have multiple repositories but they are for different product groups that work on projects that have no relationship to each other what so ever. Even those could be in the same repository but seeing how path based auth slows things down it seemed to make more sense to give each product group their own repo. BOb

RE: svnadmin create complains about subrepositories

2011-02-11 Thread Bob Archer
svn is an anti-pattern I expect there is a better way to do this... or you are not understanding RedMine's sub-projects... or there is a deficiency in redminds security that doesn't allow you to set different permissions to a nested subprojects in a single repository. Perhaps redmine doesn't require the nested projects to actually point to nested repositories? BOb

RE: Subversion Permissions Question.

2011-02-11 Thread Bob Archer
to use the default authorization > file. > > authz-db = authz > > > > vs. > > > > ### Uncomment the line below to use the default authorization > file. > > authz-db = ../../foo/bar/authz > > > > OK, so only the repositories have the sub-directories db, conf, > dav, > format, hooks and locks. > > If this is true, this installation looks like only one repository > but > I really have 506 repositories. I have repositories under > repositories. That's not good. But are you sure about that. Where are you "seeing" 506 repositories? Perhaps you just have 506 projects in a single repository. BOb

RE: What is a "baton" from subversion sources?

2011-02-11 Thread Bob Archer
t through his part of the course. So, I would expect that a baton is some symbol or reference to an object that is passed from one function to another and each function performs its responsibility modifying the baton or possible using information stored in the baton. BOb

RE: svn 1.7 improvements: Large repo? (w/ 40,000 files)

2011-02-14 Thread Bob Archer
s help me if the server _does > not_ get upgraded to v1.7? Most of the wc perf improvements will probably work with a 1.6 server. But, I expect there are some that won't. All that said, I never heard that there will be a new protocol. BOb

RE: svn 1.7 improvements: Large repo? (w/ 40,000 files)

2011-02-14 Thread Bob Archer
und the performance is much much faster. > > > Any recommended ram disk software? I've used this one: http://memory.dataram.com/products-and-services/software/ramdisk It is free for up to 4GB disks. There is also a topic on this over at superuser.com: http://superuser.com/questions

RE: migrate svn 1.4 to 1.6

2011-02-17 Thread Bob Archer
y step of a same experience? you shouldn't have to restart the service. But, you will have to restart the service that you are using, either Apache or svnserve daemon. BOb

RE: internal dirs showing up on update

2011-02-17 Thread Bob Archer
hould not appear right? How do I remove > this? I assume these folder are in your repository. Just go into the repository browser in TortoiseSVn and delete the folders. BOb > > >  /etc/subversion/config   is as provided > > and my >  /etc/apache2/mods-enabled/dav_

RE: Betr.: htpasswd without apache

2011-02-18 Thread Bob Archer
> http://svnbook.red- > bean.com/nightly/en/svn.serverconfig.svnserve.html#svn.serverconfig > .svnserve.auth.users I'm pretty sure you can use LDAP with svnserve via the SASL support. BOb

RE: SVN Structure/advantages

2011-02-18 Thread Bob Archer
out comes with open source projects that use svn... since everyone will understand that layout and will have a very good idea what is what. but even with trunk / branches / tag... there is no specification of what is on trunk. Is that where stable/tested code is. Or is that where WIP code is? BOb

RE: migrate svn 1.4 to 1.6

2011-02-18 Thread Bob Archer
much less time. A dump load of our primary repo takes about a day. svnadmin upgrade (from 1.5 to 1.6 ran in about 10 mins on our repo.) BOb > You don't have to do this but I would think about it... Remember > the > clients too.

RE: internal dirs showing up on update

2011-02-18 Thread Bob Archer
> On Fri, Feb 18, 2011 at 13:19, Nuno Carapeto > wrote: > > > > > > On Thu, Feb 17, 2011 at 8:56 PM, Blair Zajac > wrote: > >> > >> On 2/17/11 12:50 PM, Bob Archer wrote: > >>>> > >>>> I have so SVN repos (subversion)

RE: Assistance with SVN layout from CVS

2011-03-14 Thread Bob Archer
nts of rev6_453_3 into the working copy, hence trunk. Now create your branch: svn cp ~/trunk ~/branch/rev6_3_453_5 No check out that branch and put the source for _5 into it an commit. I think that will get you where you want to be, without having multiple copies of your projects in your repository and just using the cheap copies of svn. Also, this all assumes the procedure of release from trunk with future versions in branches. (Not my favorite way to go but many people us it.) BOb

RE: recursive propedit

2011-03-22 Thread Bob Archer
is possible? If you ignore a folder... you are also ignoring any contents or sub-folders of that folder. For example, if you have: /MyPath/Here/IngoreThis svn:ignore IgnoreThis as a property of the Here folder... the IgnoreThis and all its contents will be ignored. Or, is that not what you are asking? BOb

RE: SVN always thinks a few certain files need to be merged

2011-03-24 Thread Bob Archer
ng as there is merge info on a file that isn't in the parent folder the merge info will remain at the file level. Once they match the merge info in the children (files) will be elided and you won't see this happen again. I assume every time you see these property changes you are committing them? BOb

RE: SVN always thinks a few certain files need to be merged

2011-03-24 Thread Bob Archer
> > My repository is still at 1.5.4. I can have my SCM team upgrade me > to > 1.6.something. Should I do this, and would it help this problem? It depends on what version you were on... but early versions of 1.5 did create alot more mergeinfo than was necessary... and also it was created in some instances when it shouldn't have been. I highly suggest you get up to date. However, that won't "resolve" this issue... although it isn't really an issue... see my previous email. BOb

RE: SVN always thinks a few certain files need to be merged

2011-03-24 Thread Bob Archer
> On 03/24/2011 05:01 PM, Bob Archer wrote: > >> On 03/23/2011 08:02 PM, David Huang wrote: > >>> > >>> On Mar 23, 2011, at 7:52 PM, Pat Farrell wrote: > >>> > >>>> On 03/23/2011 08:34 PM, Konstantin Kolinko wrote: > >>>&

RE: Tortoise and editing files on a server

2011-03-28 Thread Bob Archer
dits > will > be on remote files. In principal they want to use tortoise. How > should > this be implemented? Frankly, my recommendation would be not like that. Each user should have a private working copy... for best performance it should be on their local PC. BOb

RE: Using tags with SVN

2011-03-31 Thread Bob Archer
of a branch for release use case. I think you are over thinking this... how is tagging a revision that contains the changes for a feature with a "Q" than tagging each file with a "Q"? BOb

RE: Advice on upgrading svn and moving to new server

2011-03-31 Thread Bob Archer
; > > I don't know that the above sentence is correct.  Can you give > > an example of a scenario when that happens? > > Working copies will be upgraded silently. A working copy is not a repository though. BOb

RE: Using tags with SVN

2011-04-01 Thread Bob Archer
to a certain revision > of a > > > file." > > > We use tags in CVS to identify the files which have passed > module > > > tests and should make it into our integration test environment. > > > So you are saying you test "files" in isolation? That se

RE: how to avoid text and tree conflict

2011-04-04 Thread Bob Archer
it is a conflict. It is a conflict because two people changed the same line of code. So, the software can't know which line of code you want to remain after it merges them... you have to tell it. You could choose one line, the other line, or even combine them in some way. BOb > >

RE: release date of Subversion 1.7

2011-04-04 Thread Bob Archer
been 3 months away for several years now. BOb

RE: how to avoid text and tree conflict

2011-04-04 Thread Bob Archer
> On Mon, 2011-04-04 at 10:26 -0400, Bob Archer wrote: > > > I read the SVN book, as there are three type conflicts: text, > > > tree and > > > properties conflict. However, I wanna know why it is a > conflict. > > > For > > > example, if there

RE: Build project in pre-commit

2011-04-08 Thread Bob Archer
changes - keeping your code base clean at all times. Optionally, you can set up TeamCity to automatically commit changes to your version control each time they pass all checks." BOb

RE: Build project in pre-commit

2011-04-08 Thread Bob Archer
would be to do all your development on a branch. Have you build scripts build from that branch. IF the build is successful perform a merge to trunk. If the build fails, don't do the merge. Since branch is never checked into there shouldn't be merge conflicts. (well, tree conflicts would still be possible.) BOb

RE: Question to Setup and Implement Subversion

2011-04-11 Thread Bob Archer
much all you need to know. Of course, after you grok it you can come back here and ask more specific questions. BOb

RE: beginner admin question: no repository found

2011-04-11 Thread Bob Archer
y", and the repository seems to be > fine. None of the config files has been changed in over a year, so > I doubt they're corrupted. Any ideas? It is possible it is binding to IPv6 rather than IPv4... I think you can pass in the IP you want it to bind to. http://www.bramschoenmakers.nl/en/node/287 BOb

RE: beginner admin question: no repository found

2011-04-11 Thread Bob Archer
ed to tell svnserve where your repository is on the machine. > e.g. > > svnserve -d -r /path/to/repo > > It's probably trying to serve a repository rooted at /, which is > probably not where yours is. > I was going to say this, but I looked at the --help for svnserver and it doesn't seem to require the -r param. I figure it roots to the pwd. But, if he isn't running it from the repo root then yea... that! BOb

RE: duplicate merge conflict

2011-04-14 Thread Bob Archer
revert your merge and verify that your working copy didn't already have those r461 merge indicators in it. I know here people have checked in files that had unresolved conflict markers in them. BOb

RE: duplicate merge conflict

2011-04-14 Thread Bob Archer
> -- > From: "Bob Archer" > Sent: Thursday, April 14, 2011 9:33 AM > To: "Daniel Walter" ; > > Subject: RE: duplicate merge conflict > > >> When I merge changes in SVN, the merges work well ex

RE: RFE: Add Subversion keyword for year

2011-04-19 Thread Bob Archer
opyright 2010-2011, 2014 Big Software, Inc. So, I wouldn't want this automatically done. I would recommend you use a copyright.txt file with the notice and have your build system or something inject it. BTW: IANAL either. BOb

RE: duplicate merge conflict

2011-04-20 Thread Bob Archer
I think > that a particular merge will generate a lot of conflicts. If you are merging everything in there is no need to worry. That is the point of merge tracking. It will determine what has yet to be merged and select the correct revisions. Here is how we have our repo set up... rather than using trunk. We find it makes things easier. We basically "branch" when we start on a new release version. So we have something like this: 1.0.0 \ \ 1.0.1 +- \ \ 1.0.2 +-- We release from the version path (branch). Any hotfixes for that version are done on that branch. Then they are merged forward "up" version. So we merge a change made on the 1.0.0 to 1.0.1 then to 1.0.2 and forward. We "try" to only have our current release (1.0.1) and one back (1.0.0) in maintenance and then the in dev version (1.0.2). Of course, you always have that one client that doesn't want to upgrade and sales/support insists we do a fix... but we still just merge it up versions until it is merged into the unreleased dev version. BOb

RE: duplicate merge conflict

2011-04-20 Thread Bob Archer
gt; > have that one client that doesn't want to upgrade and > sales/support > > insists we do a fix... but we still just merge it up versions > until it is > > merged into the unreleased dev version. > > > > BOb > > > > > > > > This seem

RE: duplicate merge conflict

2011-04-20 Thread Bob Archer
; Notice, I didn't specify and ranges. svn figures out what > revisions from > > the source path have not yet been merged in for me. > > > > BTW: Just as an aside we do have a branches folder in the project > and this > > is where we put feature branches. Although w

RE: svn prop_time and replacement

2011-04-21 Thread Bob Archer
ion > and the working copy. > > Thanks a lot! The second column of the status output shows the status of the dir/file properties. I assume you have access to the "svn status" command's API? BOb

RE: duplicate merge conflict

2011-04-21 Thread Bob Archer
rt > this, but it is not very useful for understanding what I did wrong. > > I wanted to check my version numbers, to make sure that I am using > recent > versions. My client is 1.6.13. Is there a way to get the server > version > from the svn client? I guess my question is... 1. Can you do the merge --record-only without specifying revisions. 2. What is it corrupting exactly? BOb

RE: duplicate merge conflict

2011-04-21 Thread Bob Archer
> -- > From: "Bob Archer" > Sent: Thursday, April 21, 2011 11:17 AM > To: "Daniel Walter" ; "Stefan Sperling" > > Cc: > Subject: RE: duplicate merge conflict > > >> >> Reco

RE: repo on Windows -- why not?

2011-04-22 Thread Bob Archer
d. > what are common reasons to prefer other platforms, e.g. Linux? I'm > looking for some accurate arguments and facts for my book. Thanks > for > your help. Ok, common reasons to prefer one over the other, well laid out is perfectly reasonable. ;) BOb

Re: repo on Windows -- why not?

2011-04-24 Thread Bob Aiello
Hi Mike, I recently had a client who insisted on VisualSVN on Windows. It was a very quick and easy setup. I would normally always put the repo on Linux, but some folks are just more comfortable with what they know or they may not even have a linux server.. Bob http://www.linkedin.com/in

RE: Commit to trunk and branch in a single commit

2011-04-26 Thread Bob Archer
it it in one single commit, will it break merge tracking? If you do commit the same change manually to trunk and branch and then you try to do a merge you will get a conflict. You can do a --record-only merge after the fact to resolve that problem though. Or just deal with the conflict when you do finally merge. BOb

RE: My full name and email address open to all on web?

2011-04-27 Thread Bob Archer
ing to has your name and email address in it. It will be archived. I'm not sure how it identifies "you". I'm not sure how you are expecting your email/name to be private when you post it to a publically accessible email list. BOb

RE: Trying (failing) to limit access to one user

2011-04-27 Thread Bob Archer
ccess... > > -Alan Are you sure he has "full" access? Path based auth will not hide the folder names in root. He will still be able to see them. BOb

RE: Trying (failing) to limit access to one user

2011-04-27 Thread Bob Archer
d of course have access in this case. Deny doesn't trump allow as it does in other systems. Also there is the same problem with: [/] *=rw jon= Because jon is a subset of * which gives him read/write access. BOb

RE: SVN Update is not happening from the server, though the status shows "Completed"

2011-04-27 Thread Bob Archer
diate rather than full depth giving you a sparse checkout. BOb

RE: Trying (failing) to limit access to one user

2011-04-28 Thread Bob Archer
s why I mentioned in my OP that I thought this might be me > misunderstanding the meaning of "anonymous access" in this context. What authentication method are you using? I'm guessing while *= works but "jon=" (or other user names) doesn't that isn't the full user name that svn sees. If you look at your log are the usernames the ones you are expecting and putting into the authz file? BOb

RE: just upgraded to svn 1.5 - confused

2011-04-29 Thread Bob Archer
rate you merge that rev from trunk with --record-only you can keep using the same branch. But, yes for the most part, "reintegrate" is designed for feature branches which are generally not used/needed after the feature is reintegrated into trunk. BOb

  1   2   3   4   5   6   >