RE: Installation Issues SVN 1.8.8

2014-03-12 Thread Cooke, Mark
> -Original Message- > From: Guido Larrain [mailto:larraingu...@gmail.com] > Sent: 12 March 2014 17:35 > > Hello; > > I'm trying to upgrade my SVN. right now i have installed version 1.5.6 and we > want to upgrade lo latest version (1.8.8) > > I installed SVN v1.8.8 and a new instance of

Re: Mergeinfo overwritten from successive merges

2014-03-12 Thread Branko Čibej
On 12.03.2014 21:24, Jeb Wilson wrote: > Hello all, > > Apologies if this has already been reported, but it's a difficult one to > search for. This came through from TortoiseSVN 1.8.5. > > Here's the basic way to reproduce: > > User #1 merges from A -> B and commits. > User #2 merges SOMETHING ELS

Mergeinfo overwritten from successive merges

2014-03-12 Thread Jeb Wilson
Hello all, Apologies if this has already been reported, but it's a difficult one to search for. This came through from TortoiseSVN 1.8.5. Here's the basic way to reproduce: User #1 merges from A -> B and commits. User #2 merges SOMETHING ELSE from A->B but doesn't update first to get User #1's

Installation Issues SVN 1.8.8

2014-03-12 Thread Guido Larrain
Hello; I'm trying to upgrade my SVN. right now i have installed version 1.5.6 and we want to upgrade lo latest version (1.8.8) I installed SVN v1.8.8 and a new instance of apache. but when I checked the apache log files I saw this... [notice] Apache/2.2.26 (Unix) DAV/2 SVN/1.5.6 configured -- re

RE: How to do a partial merge from branch to trunk?

2014-03-12 Thread David Aldrich
Hi Bob Understood. Thanks for your reply. David -Original Message- From: Bob Archer [mailto:bob.arc...@amsi.com] Sent: 12 March 2014 14:54 To: David Aldrich; 'users@subversion.apache.org' (users@subversion.apache.org) Subject: RE: How to do a partial merge from branch to trunk? > Hi >

RE: How to do a partial merge from branch to trunk?

2014-03-12 Thread Bob Archer
> Hi > > I am working on a branch and I want to feed some (but not all) of my changes > back into the trunk and then to continue work on the branch. > > Please will someone advise me of the correct way to handle this situation? > > Best regards > > David Generally the smallest unit you can mer

How to do a partial merge from branch to trunk?

2014-03-12 Thread David Aldrich
Hi I am working on a branch and I want to feed some (but not all) of my changes back into the trunk and then to continue work on the branch. Please will someone advise me of the correct way to handle this situation? Best regards David

Sanity check following botched --reintegrate

2014-03-12 Thread Kemp, Eric M. (GSFC-610.3)[SCIENCE SYSTEMS AND APPLICATIONS INC]
Dear SVN users: My group is using SVN 1.5.7, and our repository includes a trunk and several branches forked from the trunk. We recently tried to reintegrate a synchronized branch to the trunk but used the wrong syntax, and the error was not detected until after the commit. Instead of: 'svn m

RE: Subversion checked-out files not indexed in Windows search

2014-03-12 Thread Gareth McCaughan
Ivan Zhakov wrote: > It looks like serious issue. Could you please file issue in Subversion > issue tracker: http://subversion.tigris.org/issues Done. Issue #4478. -- g

Re: Subversion checked-out files not indexed in Windows search

2014-03-12 Thread Ivan Zhakov
On 10 March 2014 18:25, Gareth McCaughan wrote: > It appears that files checked out using Subversion (1.7 onwards) > are marked as not indexable by Windows search. The way in which > this happens appears to be as follows: > > When the WC is created: > > 1. .svn directory is created, and marked as