Re: replacing all code with latest SVN regardless of conflicts or uncommitted changes or whatever

2010-06-10 Thread Tyler Roscoe
On Thu, Jun 10, 2010 at 10:46:26AM -0500, Thomas Anderson wrote: > Say I've added a bunch of debug code to files in a particular > directory and that I want to now remove all the debug code. I could > search through the file and manually remove it all or I could just re > checkout the directory fr

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

2010-08-04 Thread Tyler Roscoe
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

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

2010-08-05 Thread Tyler Roscoe
On Thu, Aug 05, 2010 at 08:56:15AM +0200, Ulrich Eckhardt wrote: > On Wednesday 04 August 2010, Tyler Roscoe wrote: > > > > If there are no changes, I would delete the directory from branchx and > > then merge from trunk to recreate the directory on branchx. > > Why no

Re: Searchin the repository

2010-08-17 Thread Tyler Roscoe
On Tue, Aug 17, 2010 at 04:01:50PM +0200, Engebakken Geir wrote: > Note : All inquiries regarding Subversion, MKS and general Development > servers should be directed to "EDB Source Control System" I don't have their contact info. Can I reply to you and the svn list instead? > size. I have used F

Re: Help with Mac repositry permissions

2010-09-08 Thread Tyler Roscoe
On Wed, Sep 08, 2010 at 07:47:28PM +1000, Matthew Allen wrote: > sudo find /path/to/repo -type d -exec chmod 770 {} \; > > I don't know what the "2" does in front of the 770. But it looks like it > still works... so maybe thats all there is to it? The 2 controls the sticky bit. Mode 2770 s

Re: svn:mergeinfo property question...

2010-09-10 Thread Tyler Roscoe
On Fri, Sep 10, 2010 at 07:59:48AM -0700, BRM wrote: > As much as I would like to be able to use a 1.6 client on the system - I can > only get 1.5.1 on Kubuntu 8.04 TLS, and that requires using back-ports to do > so; I have used alien and the CollabNet svn rpms (now replaced by ASF svn rpms som

Re: Advice on how to merge bug fix from branch to trunk

2010-01-11 Thread Tyler Roscoe
On Mon, Jan 11, 2010 at 05:50:53PM +0800, Jean Seurin wrote: > In our process, we create a branch of a version that is going to be > released. Then we release from that branch and create a tag for each > released version. I assume you create the branch from the trunk? > The problem lies in the

Re: Setting auto properties after file(s) have been committed.

2010-01-11 Thread Tyler Roscoe
On Mon, Jan 11, 2010 at 10:43:57AM -0700, Jeremy Conlin wrote: > I just created some auto properties settings for my repository. I > need to now apply these settings to all the files in my repository. > Is there some automated way to do this or do I have to do it manually? Look at the propedit an

Re: Advice on how to merge bug fix from branch to trunk

2010-01-11 Thread Tyler Roscoe
On Mon, Jan 11, 2010 at 07:54:34PM +0100, Stein Somers wrote: > On 11/01/2010 18:09, Tyler Roscoe wrote: > >The usual way to do this is to make the bugfix on trunk and then > >cherrypick merge the change from trunk up to your branch. > > Sure, in the early stages of the rele

Re: Partial Commits of an individual file?

2010-01-19 Thread Tyler Roscoe
On Tue, Jan 19, 2010 at 02:10:48PM +1300, Andrew Thorburn wrote: > I have a particular bit of code in a project I'm working on which is > very large (too large), and I frequently need to make changes to it > for multiple issues. This means that when I go to commit, I have to > make a single commit

spam being forwarded from ad...@subversion.apache.org

2010-01-28 Thread Tyler Roscoe
I tried to reply to the latest spam but admin (ironically) would not allow me to do so: > We are sorry, but email posting to this discussion is not allowed. > [-- Attachment #2 --] > [-- Type: message/rfc822, Encoding: 7bit, Size: 1.7K --] Anyway, here is my original comment: On Wed, Jan 27, 201

Re: Is it possible to set the file mask for an existing file?

2010-01-30 Thread Tyler Roscoe
On Sat, Jan 30, 2010 at 09:29:34PM +0100, Steinar Bang wrote: > I have my unix/linux home directory checked into subversion. I would > like to restrict the file mode on some of these files to -rw--- > > Can subversion support this? Subversion doesn't track file permissions in this way. The

Re: Changing the "native" newline mode

2010-02-13 Thread Tyler Roscoe
On Fri, Feb 12, 2010 at 10:56:28PM -0500, Glenn Maynard wrote: > Telling people "don't do what you want to do; do what you don't want > instead" is not helpful. o rly? I haven't been following this thread closely but it seems that your complaint is the classic, "Doctor, it hurts when I do this."

Re: Partially reintegrate changes

2010-02-18 Thread Tyler Roscoe
On Thu, Feb 18, 2010 at 08:20:10AM -0800, Jacob Weber wrote: > > On Thu, Feb 18, 2010 at 7:17 AM, Jacob Weber wrote: > >> Let's say I have a branch where I develop two features, X and Y. I then > >> want to merge only X back > >> into the trunk. I want to do some further development on Y, and mer

Re: Making same source available in 2 areas of the repository

2010-02-18 Thread Tyler Roscoe
On Fri, Feb 19, 2010 at 10:07:10AM +1100, Tony Martin wrote: > I have an application that is made up of a windows executable and > several dll's. One of these dll's needs to be worked on directly to > develop and bug fix, however it must also be deployed as source to > allow changes and recom

Re: SVN DIFF QUESTION

2010-02-19 Thread Tyler Roscoe
On Fri, Feb 19, 2010 at 11:40:19AM -0500, Eramo, Mark wrote: > I am trying to diff the trunk and a specific tag of a project in SVN > to get a list of files that have changed AND a list of any new files > that were added to the trunk since the tag but I am not able to get > the same results as with

Re: Expected release date of RedBean for 1.6

2010-02-22 Thread Tyler Roscoe
On Mon, Feb 22, 2010 at 10:49:15AM +, David Aldrich wrote: > Currently, we are running svn client 1.6.9 against svn server 1.5.2. > Will this combination support the "svn merge --record-only" method > that you described? Yes. tyler

Re: Tree conflict - svn status cannot show?

2010-02-25 Thread Tyler Roscoe
On Fri, Feb 26, 2010 at 12:05:52AM +, Barry Scott wrote: > svn st -q > > and the output is blank. You might want to take a look at what the -q option does... tyler

Re: Empty logentry block in 'svn log --xml'

2010-02-26 Thread Tyler Roscoe
On Fri, Feb 26, 2010 at 12:56:32PM +0530, John Christopher Turner wrote: > Command being executed: > svn --username *** --password *** log --non-interactive --xml -v > --limit 1 svn://hostname/url/path > > Response: > > > > > > > > We made the assumption that there would alw

Re: unable edit existing log message

2010-03-01 Thread Tyler Roscoe
On Mon, Mar 01, 2010 at 12:15:16PM -0800, Charan wrote: > I have been trying to edit the already existing log message using > TortoiseSVN tool but it is giving me the following error. I can see that the > file pre-revprop-change hook exists in hook scripts folder with .tmpl > extension and it is ex

Re: Subversion repository utilization statistics?

2010-03-02 Thread Tyler Roscoe
On Tue, Mar 02, 2010 at 01:24:16PM -0500, Keith Theman wrote: > We have multiple projects in a single repo. Does anyone have any handy > scripts that can provide utilization statistics for the repo? What, specifically, do you mean by "utilization statistics"? tyler

Re: Could not un- and re- link ~/.subversion/config

2010-03-04 Thread Tyler Roscoe
On Thu, Mar 04, 2010 at 01:13:49PM +, Alan Brogan wrote: > I just lost a few hours trying to do this: > > $ cd ~/.subversion > $ rm -f config > $ ln -s /path/to/another/config . > > The link command kept failing, because "File exists" >WTF ? > > Turns out I cannot remove ~/.subversion/* i

Re: Merge question

2010-03-04 Thread Tyler Roscoe
On Thu, Mar 04, 2010 at 02:29:33PM -0500, CoolBreeze wrote: > Now having all production source code witin the Trunk and development within > the Branches, if I'm working on the source of a particular sub-program > within the Branches as well as another developer is working a different > source file

Re: Merge question

2010-03-04 Thread Tyler Roscoe
On Thu, Mar 04, 2010 at 02:49:53PM -0500, Bob Archer wrote: > http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.cherrypicking Bob is an excellent example of someone less lazy than me :). tyler

Re: Could not un- and re- link ~/.subversion/config

2010-03-05 Thread Tyler Roscoe
On Fri, Mar 05, 2010 at 10:33:40AM -0500, Bob Archer wrote: > > This occurred on various distros of Linux > > Fedora 8 and 3 > > CentOS 4, 4.4 and 5 > > Mandrake 10.2 and 2006.0, 2007.0 > > OSX > > > > Most of these are chroot environments on the same server > > > > There is no su

Re: SVN and Windows/Linux permissions

2010-03-17 Thread Tyler Roscoe
On Wed, Mar 17, 2010 at 01:02:10PM -0400, Andy Levy wrote: > On Wed, Mar 17, 2010 at 12:40, wrote: > > This might not really be a SVN question, but somebody may have encountered > > it. I need to be able to export code from windows hosted SVN (Apache/2.0.58 > > (Win32) DAV/2 SVN/1.3.1) and mainta

Re: Change email address.

2010-03-17 Thread Tyler Roscoe
On Wed, Mar 17, 2010 at 08:41:04PM +, Anthony Davis wrote: > Sorry to ask this to the list, but i cant find any documents about it, > I need to change my svn mailing list address, how can I do this > please? unsubscribe old address. subscribe new address. pretty sure that's the easiest/best/o

Re: Documentation of historical URI feature

2010-03-17 Thread Tyler Roscoe
On Thu, Mar 18, 2010 at 11:50:23AM +0900, Craig McQueen wrote: > Comparing: > http://subversion.apache.org/docs/release-notes/1.6.html#historical-uris > http://svnbook.red-bean.com/nightly/en/svn.serverconfig.httpd.html#svn.serverconfig.httpd.extra.browsing > > (namely the box "Can I View Older R

Re: weird merge

2010-03-25 Thread Tyler Roscoe
On Thu, Mar 25, 2010 at 11:09:49AM +0100, Xavier Noria wrote: > That is, after you create branch b from trunk, you work on b, > occasionally you sync with trunk this way: > > cd b > svn merge ^/trunk . > > and when you are done in b finally > > cd trunk > svn merge --reintegrate

Re: weird merge

2010-03-26 Thread Tyler Roscoe
On Fri, Mar 26, 2010 at 03:17:54PM +0100, Xavier Noria wrote: > Even if I try to fix it by hand with > > svn merge -r2:2909 ^/trunk --record-only > > a subsequent merge still tries to get 2 through 2909. Moreover > > svn propget svn:mergeinfo . > > returns nothing. Are you using a merg

Re: Problem creating new repo

2010-03-29 Thread Tyler Roscoe
On Mon, Mar 29, 2010 at 03:08:21PM +0100, Randi Hillerøe wrote: > I just installed subversion on a QNAP T410, NAS, which completed all fine > however it went wrong when I tried to create the first repository. > > I use the command: svnadmin create repo_path > But in a few moments it just says "Il

Re: Problem creating new repo

2010-03-29 Thread Tyler Roscoe
s it possible to install on windows too? Yes, strace is a Linux tool. Presumably a similar tool exists for whatever OS you're running (this NAS you're using runs Windows? curious.) tyler > 2010/3/29 Tyler Roscoe > > > On Mon, Mar 29, 2010 at 03:08:21PM +0100, Randi Hillerře

Re: killer feature -- HEAD+1

2010-04-20 Thread Tyler Roscoe
On Tue, Apr 20, 2010 at 03:42:02PM -0700, David Brodbeck wrote: > Pablo, > > I apologize, my message was a lame attempt at humor. I didn't think > through the fact that it might not translate, given the language > barriers involved on this list. If non-native speakers of English don't learn Engl

Re: Copying from one repository to another, flattening the early part of the source repo's history in the target repo?

2010-04-29 Thread Tyler Roscoe
On Thu, Apr 29, 2010 at 11:06:40AM -0700, Dan Stromberg wrote: > So to make it work well from the start, I need to test it well. To > test it, I really want to copy from one SVN server's trunk to another > SVN server's repository - flattening a significant part of the early > history from the sour

Re: getting the version of a file in subversion

2010-05-04 Thread Tyler Roscoe
On Tue, May 04, 2010 at 07:36:59PM +, patrick rajack wrote: > (2) Error message - svn invalid option > > > svn info svn://cads102avi3.toronto.usf.ibm.com/AVIVANA_FINANCIALS/Canada > RICE > Repository/RICE Components/AP/Report/Opt-104 - rap04b-Aviva Account Analysis > with AP Detail by Co

Re: Partial Checkout Script

2010-05-17 Thread Tyler Roscoe
On Mon, May 17, 2010 at 03:41:22PM -0400, Eramo, Mark wrote: > I am wondering if there is a simple way to script the checkout of only > certain project folders in SVN without checking out others. You want to create a "sparse working copy". Look at the --depth options to update and checkout. Note