Re: Advice on how to merge bug fix from branch to trunk
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 bug fix of this released version. We have to > apply manually the fix to the branch, release a new tag, and then report > the same modification to the trunk. 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. Is there a reason you can't do it this way? tyler
Re: Setting auto properties after file(s) have been committed.
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 and propset subcommands, and the -R flag. Failing that, find [...] | xargs svn propset [...] or equivalent should be helpful. tyler
Re: Advice on how to merge bug fix from branch to trunk
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 release process, but near or past > D-day, as any decent CMM zero team we switch to panic mode. We hotfix > things in the release branch, and (re)release, then after the dust has > settled merge back to trunk. And then see what was wrong with the hotfix. And I'm sure you never lose track of any "hotfixes" done in this way. There are a lot of things you *can* do to solve this problem. I'm simply stating what I think is the accepted best practice. Caveat coder, etc. etc. tyler
Re: Partial Commits of an individual file?
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 which fixes or implements multiple issues. This > isn't really ideal, as it means that you can't look at the diffs of > the file to see which change applies to which issue - you just see a > nice big list of changes, and have to guess at what changes apply to > what issue. I would use a shelf (or branch). Copy the file from trunk, make change #1, commit to shelf, make change #2, commit to shelf, etc. Then when you know what changes are actually needed, you can merge them one-by-one back to trunk. tyler
spam being forwarded from ad...@subversion.apache.org
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, 2010 at 11:59:27PM -0800, ad...@subversion.tigris.org wrote: > We are sorry, but email posting to this discussion is not allowed. > Date: Thu, 28 Jan 2010 01:59:25 -0600 > From: George > To: us...@subversion.tigris.org > Subject: An e-card from George for you > > An e-card from George for you Why are these spam messages being forwarded to the list? Can we, um, not do that? Thanks, tyler
Re: Is it possible to set the file mask for an existing file?
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 files in your woking copy will have permissions based on the umask setting of your shell. tyler
Re: Changing the "native" newline mode
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." Several people in the community have suggested, "Then don't do that." I would take this sage advice (i.e. don't share working copies across platforms) or at least one of the proposed workarounds (I saw the idea of setting eol-style to CRLF; did someone suggest running unix2dos before using the working copy on your Windows box?) rather than complaining that the advice is not helpful. I can't find it right now but there was a presentation about the top ten ways *not* to use Subvesion. One of the entries was about using Subversion in a way that it was not designed to be used. This arises most frequently when people want to use Subversion as a backup mechanism, but I think it applies equally to your desire to use a single working copy across platforms no matter the cost. good luck, tyler
Re: Partially reintegrate changes
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 merge it > >> into trunk later. > >> > >> Is this possible with Subversion? > > > > Yes. When merging from branch to trunk, you would need to specify the > > specific revisions to merge. You could not use reintegrate. Let's > > assume when you commit this merge to trunk that revision 200 is > > created. > > > > Back on the branch you should run: > > > > svn merge --record-only -c200 ^/trunk > > > > To record the merge. Now you can just do normal synch merges with > > trunk and reintegrate the branch when you are done. > > > Thanks! I'll give that a try. > > But I was under the impression that if I did a non-reintegrate merge > back into the trunk, it would cause self-referential mergeinfo to be > written there. That is, the trunk would have mergeinfo for the trunk. > And then that ends up screwing up things later on. The --record-only merge is what keeps you away from this problem. tyler
Re: Making same source available in 2 areas of the repository
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 recompiles when the application suite is deployed to > production. (Probably poorly explained - sorry) How about svn externals? tyler
Re: SVN DIFF QUESTION
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 CVS diff. How about svn diff --summarize (and maybe --xml)? tyler
Re: Expected release date of RedBean for 1.6
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?
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'
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 always be content in that > section, but that was clearly invalid. Any ideas on what the cases are > where this could possibly happen? This may be a dumb question but is there a commit message for revision 3861? AFAIK svn has no problem with empty commit messages. tyler
Re: unable edit existing log message
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 executable. Subversion won't exexcute hooks called *.tmpl. Rename the hook script to not have that extension and your Subversion server should start using it. tyler
Re: Subversion repository utilization statistics?
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
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/* in one command, as some other > process is protecting them from deletion (but not from editing). > > Eventually I did figure out the workaround, which is simply to join them into > one command > $ rm -f config && ln -s /path/to/another/config . What OS is this? Was svn running at the time? Sounds like an OS issue. AFAIK Subversion has no special logic to protect its config files. tyler
Re: Merge question
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 also under the same Branch, I've completed my work and am ready > for my changes to be merged back into the Trunk. Is it possible to merge This is a cherry-pick merge. Check out the Merge chapter of the book (or wait for someone less lazy than me to link you to it). tyler
Re: Merge question
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
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 subversion server on those machines, they are used as > > subversion clients only, so > > No - subversion was not running at the time > > > > If subversion has no such special logic how come it happens > > on three different machines, on 9 different OSes ? > > And on all of them happens *only* in the directory ~/.subversion ? > > There has to be some app or process that is doing it. Agree. > Is there a tool that you can monitor file access in Linux. With > windows I would use something like Process Monitor from sysinternals. Maybe lsof(8)? Not quite right for this job but a starting point at least. tyler
Re: SVN and Windows/Linux permissions
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 maintain linux permissions set by linux clients > > at commit time. I typically get permissions that omit the group and other > > permissions, like so: > > > > Y:\ls -altr How are you running ls on a Windows box? If this is Cygwin, that's another variable which might alter the permissions on checked-out files. > > Do I *have* to dl to a linux partition, will windows always strip some unix > > permissions? > > Subversion doesn't track/manage permissions beyond +x (executable). > > If you're connecting to a SAMBA share from Windows and doing an export > there, it's down to your SAMBA configuration. Also, check your umask settings. tyler
Re: Change email address.
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/only way. tyler
Re: Documentation of historical URI feature
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 Revisions?") > > It seems the latter is out-of-date. Should I submit an issue at: > http://subversion.apache.org/issue-tracker.html The svnbook folks have a separate issue tracker: http://code.google.com/p/svnbook/issues/list tyler
Re: weird merge
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 ^/branches/b . > > First, that is correct right? Yes. > svn merge ^/trunk . > > instead of being silent says > > --- Merging r2 through r2909 into '.' > > and then a ton of tree conflicts appear. But that is kind of weird > because this project is at revision ~28000, why a range from 2 to > 2909? For some reason, your branch doesn't know that it already has revisions 2 through 2909, so svn attempts to merge those revisions in, leading (apparently) to tree conflicts. You should look at your branch's ancestry to make sure those revisions are not needed. If they're not, you can use a --record-only merge to make the branch think it has those revisions. Subsequent merges from trunk should then skip over those revisions and merge only what you want. hth, tyler
Re: weird merge
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 merge-capable client and server (svn >= 1.5.0)? What does svn say after you perform the record-only merge? Nothing? > Another fact is that svn log in the branch contains everything down to r1. What about svn log --stop-on-copy? When was your branch created (what revision)? tyler
Re: Problem creating new repo
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 "Illegal instruction" - which I really > can't figure out what means... That's really all it says? No other error messages? > Is there any way to get som more debugging information than just "Illegal > instruction"? Do you have strace or similar available on this machine? Can you build a debug version of Subversion? tyler
Re: Problem creating new repo
Keep replies on list if you want help. On Mon, Mar 29, 2010 at 07:32:46PM +0100, Randi Hillerøe wrote: > No other error message... I've searched a lot to find some way to get just a > bit more info, but I didn't find anything :S strace, isn't that some linux > stuff? Or is 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 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 "Illegal instruction" - which I really > > > can't figure out what means... > > > > That's really all it says? No other error messages? > > > > > Is there any way to get som more debugging information than just "Illegal > > > instruction"? > > > > Do you have strace or similar available on this machine? Can you build a > > debug version of Subversion? > > > > tyler > >
Re: killer feature -- HEAD+1
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 English language humor from people like us, they'll learn it from exported American television, and nobody wants that :). tyler (fwiw i liked your mail and if you had posted it ~3 weeks ago i might have been able to use it for an April Fool's Day prank)
Re: Copying from one repository to another, flattening the early part of the source repo's history in the target repo?
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 source trunk, and then having as-identical-as-practical > checkin comments for the later history. Use svnadmin dump and maybe svnfilter to generate a dump file from your production repo. Use svnadmin load on the dump file to load this massaged repo data into your test repo. Bob's your uncle. tyler
Re: getting the version of a file in subversion
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 Cost Centre/DB Scripts/XXAVI_RAP04B_UTILITY_GRANT.sql Should work if you put quotes around the svn URL. tyler
Re: Partial Checkout Script
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 that sparse working copies sometimes don't play nice with different kinds of merge operations. For day-to-day work they can be extremely handy, though. tyler
Re: replacing all code with latest SVN regardless of conflicts or uncommitted changes or whatever
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 from SVN and replace the debug directory with > the latest SVN code. Problem is, typing in "svn checkout" requires > you know the URL of the repository / directory you're checking out. rm -rf bad_directory svn update bad_directory should do the trick. tyler
Re: Tree conflict: local add, incoming add upon merge
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 changes from one branch to another is always to merge. > I am now merging the latest changes from trunk into BranchX, but I am > getting a conflict: > > C myDirectory > > local add, incoming add upon merge Right. The directory already exists in your branch, so svn is confused. This confusing is because, without doing a merge, svn has no way to know how the new directory ended up on your branch. > There are no code changes between myDirectory in trunk and BranchX. > Why am I getting this conflict? I thought svn copy was the proper way > to copy files/directories between branches? Does anyone know how I > can resolve this so that in future commits people will not have to > deal with this conflict again? If there are no changes, I would delete the directory from branchx and then merge from trunk to recreate the directory on branchx. tyler
Re: Tree conflict: local add, incoming add upon merge
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 not simply merge the revision where the dir was added to the trunk into > the branch? This will obviously generate a tree conflict with the dir, plus > perhaps some other changes. The tree conflict could be solved by reverting > the merge operation there, all other changes including the svn:mergeinfo I suggested deleting and re-merging because it is fewer steps and requires less munging with mergeinfo. tyler
Re: Searchin the repository
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 Fisheye to search the repos for all pom files, so I > have this list of filenames. Now I would like to create an empty > working copy, and just check out the pom files in question and then > search the files for contents afterwards. I try to use svn up for the Try svn checkout or svn cat (or maybe even svn export). tyler
Re: Help with Mac repositry permissions
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 says read-write-execute
permissions for user and group and the group sticky bit set to on.
See the chmod(1) man page for details on what sticky bits do.
tyler
Re: svn:mergeinfo property question...
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 somewhere I presume) with Ubuntu 8LTS with no problems. tyler
