Re: Svn merge reintegrate question

Hi Mail filters caught this so I didn't see it until now. I appreciate your feedback and I will look at your input as soon as possible. Thanks! / Erik On Wed, Mar 7, 2012 at 8:24 PM, Stefan Sperling wrote: > On Wed, Mar 07, 2012 at 03:47:31PM +0100, Erik Andersson wrote: > > I&#

Re: best strategy for long-living branches / reflective merges

Hi How did you solve this? Cheers / Erik On Sun, Jul 24, 2011 at 3:37 PM, Tino Schwarze wrote: > Hi there, > > I'm looking for a best practice for the following situation: We have > several long-living product branches forked off a common trunk. They > cannot closely follow trunk, that is, merg

Svn merge reintegrate question

I'm a svnmerge.py user, trying to understand core svn merging. If creating branches from trunk, you cannot have two release branches and keeping the release branches alive with reintegrate? When the second release branch is merged to the trunk, the first release branch can no longer be merged to

How do I diff a large svn:externals file

Hi I have a svn:externals where I point to different versions of my components. It's like 30 components, and I would like to be able to diff the changes I make in the svn:externals before I commit when I'm updating a component. Is there some way to present a better diff then the svn:externals cont

Re: Web Browsing previous versions and version diffs?

On Thu, Feb 3, 2011 at 8:44 AM, Cooke, Mark wrote: > > > On Thu, Feb 3, 2011 at 5:34 AM, Curley, John > > > wrote: > > > > > > Hi all, > > > > > > Two questions, related I hope. > > > > > > Our svn repositories are accessed through the > > > apache/http method, which presents the cur

Re: svn: Repository moved permanently to '/viewvc/incubator/thrift/trunk/lib/java/'; please relocate

Try: http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.ref.svn.c.switch Cheers / Erik 2010/10/18 周晓青 > Hi , > > When I checkout one svn repository,the svn return this error > message,please tell me how t

Re: subversion configuration problem

2010/9/15 Erik Andersson > > > 2010/9/15 Kayhan Yüksel > > This is the svnserve configuration file: >> >> >> >> ### This file controls the configuration of the svnserve daemon, if you >> >> ### use it to allow access to this repository. (If y

Re: subversion configuration problem

2010/9/15 Kayhan Yüksel > This is the svnserve configuration file: > > > > ### This file controls the configuration of the svnserve daemon, if you > > ### use it to allow access to this repository. (If you only allow > > ### access through http: and/or file: URLs, then this file is > > ### irre

Re: Does svn merge --reintegrate ^URL syntax really work ?

10 sep 2010 kl. 04:16 skrev LiuYan 刘研 : > > Hi, > > I'm learning Subversion via svn-book, I encountered a problem in section > "Reintegrating a Branch": > http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate > > In this section, it

Re: Two trunks in one repository?

On Thu, Sep 9, 2010 at 8:52 PM, Geoff Hoffman wrote: > > We have hundreds of trees, each with their own trunk/ branches/ tags/ in > one SVN repo. Works great. You may want to look at svn:externals. It may > require re-thinking how you're using SVN a bit, but the payoff can be big. > Basically you

Re: Two trunks in one repository?

On Thu, Sep 9, 2010 at 8:00 PM, Itamar O wrote: > On Thu, Sep 9, 2010 at 8:38 PM, Tech Geek wrote: > >> So the concepts of trunks, branches, tags are transparent to SVN. We are >> in a situation where we might need to have two trunks in one SVN repository. >> The reason is that we have a family

Re: Help with Mac repositry permissions

Hi Not really sure about mac.. but what I would do in linux would be: sudo find /path/to/repo -type f -exec chmod 660 {} \; sudo find /path/to/repo -type d -exec chmod 2770 {} \; sudo chown -R root.www-data /path/to/repo How do you remove the global permissions? What error message do you get?

Re: Svn on apache = "403 Forbidden in response to PROPFIND"

2010/9/2 Mikołaj Tutak > Hi! > > I have "plain" s...@apache server on debian linux (stable). However svn > "checkout" generates some strange error: "svn: Server sent unexpected return > value (403 Forbidden) in response to PROPFIND request for '/svn/test'". On > the apache side it's: "client den

Re: Merge scripts

Hi Following up on this since I didn't recieve any feedback of any kind. I'd like to give it one more try.. Cheers / Erik On Fri, Feb 19, 2010 at 12:26 PM, Erik Andersson wrote: > Hi > > Have anyone already created some scripts for making life easier using svn > 1.6

Re: hint of the day

On Wed, Sep 1, 2010 at 2:11 PM, Jeremy Mordkoff wrote: > Just an FYI for anyone that does merging. > > I just spent an hour cleaning up a mess with my mergeinfo's. I missed a > hint that I was about to do something really stupid. > > Here's the merge: > > > [rele...@zaz1 rel_2_5]$ svn merge $B/r

Re: Re: please help about SVN authentication

a tag for /trunk. > or is there something wrong with my configuration? Are you using the SVNParentPath or SVNPath directive? Can you show us your Subversion section for Apache? > > At 2010-09-01 14:11:07，"Erik Andersson" wrote: > > > > 2010/9/1 alinagra > >>

Re: please help about SVN authentication

2010/9/1 alinagra > Hi, buddies, > > I have setup a SVN server and I use SASL authentication. But right now I > have a authz question: > I can create tags with accont TIM, but when I try to create a tag with the > account not jim, it reports "access denied" error. > Where do you create tags? >

Re: Rolling back some components of a tag

//svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.cherrypicking and http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.changesets maybe even all http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html Cheers / Erik > > > Da

Re: Rolling back some components of a tag

ther way of changing the revision of one file in a branch, > where that revision has not existed in the branch before? > > > > David > > > > > > *From:* Erik Andersson [mailto:kir...@gmail.com] > *Sent:* 19 August 2010 12:51 > *To:* David Aldrich > *Cc:* users@

Re: Rolling back some components of a tag

Hi I'm not sure what you are trying to achieve.. but.. On Thu, Aug 19, 2010 at 1:25 PM, David Aldrich wrote: > Hi > > It has been suggested that I use peg revisions to solve this problem. > However, I don't understand peg revision syntax. > > As a test, I created a new text file in the trunk cal

Re: copy-merge in Subversion?

On Thu, Aug 19, 2010 at 8:27 AM, Cooke, Mark wrote: > > -Original Message- > > From: Lezz Giles [mailto:lgi...@tripadvisor.com] > > Sent: 18 August 2010 18:14 > > To: Ryan Schmidt > > Cc: users@subversion.apache.org > > Subject: Re: copy-merge in Subversion? > > > > On Aug 18, 2010, at 11

Re: Restore all trunk!

Hi You're not really making sense, but I would recommend that you leave your working copy alone for now. Make a new checkout that will get you latest in trunk. Merge back to the revision you wanted and commit.. Now you should be back where you were before you messed up. Then ask us for help on w

Re: SVN logout command

Lookup the parameter --username. I don't think there exists login/logout functionality in svn, but maybe you have cached your credentials. You don't say what client you're using.. Cheers / Erik On Fri, Aug 6, 2010 at 6:14 AM, Sanjay Naika wrote: > Hello sir, > > I have set svn account and taken

Re: svn diff working copy against a different branch

On Wed, Aug 4, 2010 at 9:09 PM, Mark _ wrote: > Hi all, > > I have a system where there is a "trunk" and a branch called "branchX". I > have checked out branchX and merged the trunk code into branchX on my > working copy. I am trying to diff my working copy against trunk like so: > svn di

Re: Some files won't be imported to my repository!

You probably have an svn:ignore set on *.so *.a? Cheers / Erik On Tue, Jun 22, 2010 at 10:59 AM, Kevin Wu wrote: > Hi folks > > I created a repository and imported one entire directory. > > But some files in that directory were not added to my repository. > > I logged the import process and con

Re: Installation Link

Follow the link on: http://subversion.tigris.org/ to http://subversion.apache.org/ Cheers / Erik On Fri, Jun 18, 2010 at 11:17 AM, Daga, Rohit wrote: > Hi, > > > > I have already installed > TortoiseSVN-1.6.8.19260-x64-svn-1.6.11.msi

Re: Log info for a branch

On Fri, Jun 11, 2010 at 2:03 PM, Ryan Schmidt < subversion-20...@ryandesign.com> wrote: > > On Jun 11, 2010, at 07:01, David Aldrich wrote: > > > I would like to show log information for a branch, to show when the > branch was created and when merges from the trunk were committed to the > branch.

Re: Log info for a branch

On Fri, Jun 11, 2010 at 2:08 PM, Erik Andersson wrote: > > > On Fri, Jun 11, 2010 at 2:03 PM, Ryan Schmidt < > subversion-20...@ryandesign.com> wrote: > >> >> On Jun 11, 2010, at 07:01, David Aldrich wrote: >> >> > I would like to show log informat

Re: How to replace CVSROOT/modules features by svn

Svn externals? http://svnbook.red-bean.com/nightly/en/svn.advanced.externals.html Cheers / Erik On Thu, May 27, 2010 at 9:50 AM, "Spilker, Jörg" < joerg.spil...@sla.niedersachsen.de> wrote: > Hello, > > I have to migrate some

Re: Downgrade repository's version (1.4->1.3) without losing local modifications

What about: On B: svn diff working_copy > localmods.patch On A: svn co new_working_copy patch < localmods.patch Not sure about the syntax, but the strategy should work? Cheers / Erik On Wed, May 26, 2010 at 10:13 PM, Jeremy Whitlock wrote: > > There is a script floating around somewhere that w

Re: Is svn branching too difficult?

On Tue, May 18, 2010 at 4:11 PM, Mark Phippard wrote: > On Tue, May 18, 2010 at 9:55 AM, David Aldrich > wrote: > > > I have just finished working on a branch and have performed a reintegrate > merge back into the trunk. I only worked on 4 files in the branch and I > carefully merged from trunk

Re: mailer.py matches all paths; ignores for_paths; SVN 1.6.9

How have you setup your structure? module/trunk module/branches If so, try: */trunk Cheers / Erik On Mon, May 17, 2010 at 11:50 PM, Erik Hemdal wrote: > I'm trying to solve what must be a trivial problem; yet I'm missing > something -- probably very basic. > > Goal: Use mailer.py to email for

Re: Re: Problem compiling subversion 1.6.11

>From the INSTALL: "On Unix systems, if you are building neon as part of the Subversion build process (as described in section I.4 above), you can pass flags to Subversion's "./configure", and they will be passed on to neon's "./configure". You need OpenSSL installed on your system, and you must

Re: Problem compiling subversion 1.6.11

You probably want a package named openssl-devel on Fedora (openssl-dev on Debian)? Cheers / Erik On Tue, Apr 27, 2010 at 1:22 PM, wrote: > # make > -- making all in apr > make[1]: Entering directory `/tmp/subversion-1.6.11/apr' > make[2]: Entering directory `/tmp/subversion-1.6.11/apr' > ma

Re: Repository size not decreasing after deleting a file.

Hi Yes, it is a feature, not a bug. The whole point of using a repository is that you can always go back to a previous revision, so the file needs to still be there. Cheers / Erik On Tue, Apr 20, 2010 at 10:38 AM, Ravi Roy wrote: > Hi, > > I was curious to know if deleting a file from the repo

Re: Unable to checkout files: Can't open file: Permission denied

The user running apache needs write access to your repository. Cheers / Erik On Tue, Apr 13, 2010 at 10:01 PM, Disc Magnet wrote: > This is my configuration. > > > DAV svn > SVNParentPath /home/magnet/myrepository/ > > > The checkout command runs fine: > > svn co http://localhost/myreposito

Re: modifying the dot svn file

No need to do it hackish. Lookup svn switch --relocate: http://svnbook.red-bean.com/en/1.1/re27.html Cheers / Erik On Tue, Apr 6, 2010 at 2:42 PM, Phil Pinkerton wrote: > I have several projects that are transferring from one subversion server to > another, which means the URL has changed, my qu

Re: why mod_dav_svn.so is not presented after I have run make

Aren't you missing 'make install' as well? Cheers /Erik 2010/3/26 kudiejlq > Hi, > I have met a problem when install sebverion 1.6.9 on RedHat ES 4.5. > > I did things that INSTALL told me and the run > #./configure > #make > and there is no error message have been raised, but I can not find >

Re: Installing two subversion release on the same machine

Maybe this will help? http://subversion.apache.org/faq.html#unrecognized-url-error Cheers / Erik On Thu, Mar 25, 2010 at 8:56 AM, wrote: > > Hi, > > sorry for the not so large explanation, anyway I defined PATH and > LD_LIBRARY_PATH

Re: Retrieval of mergeinfo unsupported (even after repo upgrade)

This? http://packages.debian.org/etch-backports/libapache2-svn Cheers / Erik On Wed, Mar 24, 2010 at 3:37 PM, Mark Phippard wrote: > On Wed, Mar 24, 2010 at 10:39 AM, James Thomson > wrote: > > On 24/03/2010 14:31, Mark Phippard wrote:

Re: In CVS I had a %Log% directive I could insert into my source code.

http://subversion.apache.org/faq.html#log-in-source Cheers / Erik On Tue, Mar 9, 2010 at 4:05 PM, Strickland, Larry < larry.strickl...@infocrossing.com> wrote: > In CVS I had a %Log% directive I could insert into my source code. Is > there a

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

try: "rm -Rf config" Cheers / Erik On Thu, Mar 4, 2010 at 2:13 PM, Alan Brogan wrote: > Hello the list, > > 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 ? >

Re: Modify files in start-commit

Hi Not sure I really understand the problem, but how about creating a tag(version) in post-commit? /component/trunk -> /component/version/build Cheers / Erik On Wed, Feb 24, 2010 at 12:34 PM, Bailey, Darragh wrote: > > Is it possible to modify files in a start-commit hook and include them wit

Merge scripts

Hi Have anyone already created some scripts for making life easier using svn 1.6 merge tracking and are willing to share? I want a replacement for svnmerge.py avail -l Something like: svnAvail.py -S Running: svn mergeinfo --show-revs eligible | xargs -I {} svn log -v -{} I'd like a script for

Merge tracking questions

Hi I'm looking into moving from svn 1.4.x to svn 1.6.x and migrate from svnmerge.py merge tracking to core svn merge tracking. I'm now investigating how to merge feature branches. I'd like to merge a branch to the trunk and continue work in the branch. I've found two alternatives 1. merge --rein