Re: Merge conflict markers... indicate what?

ion 40712 You have to decide what version of the two you want to keep. -- Olivier Sannier oliv...@obones.com http://www.obones.com/ Retrouvez-moi sur Viadeo : http://www.viadeo.com/invitationpersonnelle/0023asu3wwgwpzx

Re: Merge conflict markers... indicate what?

Bob Archer wrote: Bob Archer wrote: Hi All, I am doing our weekly merge from our release version project path to our new version development path. I am a bit confused at what the conflict markers are showing me... here is the snippet of the code with the confl

Re: Why is --reintegrate neccessary?

Tino Schwarze wrote: Hi there, I've had a discussion with a collegue yesterday and he wondered why --reintegrate is neccessary for reintegration merges at all. He supposed SVN should be able to determine that the intended merge is a reintegrate by looking at the mergeinfo. So, this is just a qu

Re: question about "Tree conflict: local edit, incoming delete upon merge"

emerson wrote: emer...@emerson-desktop:~/workspace/branches/stable$ svn status modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java C modules/com.company.search/src/java/com/company/search/api/response/DoRetrieveNatAdFeed.java >local edit

Re: question about "Tree conflict: local edit, incoming delete upon merge"

! I just did: - revert that file - update from svn, nothing to update - merge that revision - got conflict One detail I left out: we are using 1.6 client and 1.4.4 server. Would that be the reason of these type of conflicts? Regards Emerson On 8 July 2010 12:34, Olivier Sannier wrote

Re: svn checkout - special characters in file name are not encoding properly

Csaba Raduly wrote: On Wed, Aug 11, 2010 at 4:49 PM, Michael Pruemm wrote: Vincent Lefevre wrote: (snip) Under these conditions, the only possibility is to encode the filenames in UTF-8 anyway. So, why not enforcing that? But don't forget that different platforms may u

Re: Getting error: 'Could not read response body: Secure connection truncated'

David Aldrich wrote: My suspicion is that the error is an indication of a timeout that happens because we use per-directory authorisation in Apache. I saw an article that suggested that setting SVNPathAuthz off in httpd.conf may fix this problem. Unfortunately, we must use per-directory author

Re: Managing modifications to an open source product

On 14/10/2010 21:45, Dan Nessett wrote: On Thu, 14 Oct 2010 15:38:41 -0400, Bob Archer wrote: I develop for a site that uses Mediawiki (MW). We make some modifications to it before deployment. Generally, (using subversion) we check out a tagged version into a workspace, recursively delete the

Re: Can't connect to github anymore

Le 13/01/2024 à 22꞉11, Nico Kadel-Garcia a écrit : On Sat, Jan 13, 2024 at 4:02 PM Johan Corveleyn wrote: On Sat, Jan 13, 2024 at 8:28 PM roger21 wrote: hey there suddenly i can't connect to github anymore (svn update or svn checkout) i get the following error: svn checkouthttps://github.c

svn list gives E160016 error on a specific URL

Hello, I'm trying to use SVN on Windows to connect to the SVN interface of a GitHub repository as it's much easier to integrate in my overall setup. Using SVN 1.6.16 (CollabNet build), I was able to issue this command successfully: svn list --non-interactive https://github.com/project-jedi/j

Re: win32svn for 1.9.1?

On 08/09/2015 18:57, Win32Svn wrote: On 2015-09-08 13:00, Stefan Hett wrote: On 9/7/2015 10:21 PM, Win32Svn wrote: On 2015-09-07 18:59, Barry Scott wrote: On 7 Sep 2015, at 11:43, Andreas Stieger wrote: Hi, Barry Scott wrote: I see that the recent 1.7 and 1.8 win32svn builds being annou

How to know if a file was ever in the repository

Hello all, I'm wondering if there is a possibility to know if a file was present in a repository at any given time, even if it was deleted later on. Basically, if I had this URL : http://host/myrepos/folder/to/file/myfile.txt I would like a command, or series of command that could tell me if

Re: Network Repository - user with 'read only' access - \format file security

Chris Coleman wrote: Error: Can't open file Error: '\\aab1234\Common\repo\MyProject\trunk\format': Error: The system detected a possible attempt to compromise security. Please ensure Error: that you can contact the server that authenticated you. This last message comes from the Windows securit

Re: How to run post-commit as a backgorund process??

Shalinda Adikari wrote: While going through some of the forums, I found following command to do the task. $SVNSYNC synchronize URL_TO_MIRROR_REPO --username=svnsync --password=svnsyncpassword>/dev/null 2>/dev/null& But this solution is rather different to yours one. As you mention in your repl

Reintegrate with vendor branches

Hello all, Let's consider the following repository structure : tags branches feature1 trunk libs libA libB project1 vendors libA current libB current The repository is at revision 100 libA and libB are external libraries managed as vendor branches which were merged tw

Re: Reintegrate with vendor branches

Olivier Sannier wrote: Hello all, Let's consider the following repository structure : tags branches feature1 trunk libs libA libB project1 vendors libA current libB current The repository is at revision 100 libA and libB are external libraries managed as v

Re: Reintegrate with vendor branches

Ulrich Eckhardt wrote: Check if while merging you omitted changing the mergeinfo in the 'libA' folder. If so, that's probably a human error. Adding the missing info manually is the right way to go. Actually, the fact that merging to X changes the mergeinfo in subdir Y that wasn't touched is a co

Re: --reintegrate technical documentation?

Todd, David wrote: I'm looking for a pointer to a technical explanation of what happens when one uses --reintegrate. A number of my users are of the opinion that it's a fragile mode, due to it complaining about missing ranges in merginfo. It's making it hard to sell use of that facility. I

svn switch does not update relative externals

Hello all, Let's say we have the following repository: /trunk /trunk/bin /trunk/sources/report_engine/models and an external on bin defined as the following: ../sources/report_engine/models models so when I checkout trunk, I get a copy of /trunk/sources/report_engine/models inside the bin/mo

Re: svn switch does not update relative externals

Johan Corveleyn wrote: On Mon, Feb 22, 2010 at 3:31 PM, Olivier Sannier wrote: I reread the svn book and it is not clear to me whether or not svn switch is supposed to update a relative external. To me it would be quite logical that it would, hence my surprise when I saw the above behavior

Re: Managing Vendor Branches

James Mansion wrote: Jeff Mott wrote: I've recently needed to track changes for vendor code drops, so I read the SVN book's vendor branches chapter. But I'm not entirely happy with part of the procedure, so I'd like to talk it out and, I hope, find a better way. I struggled with findinng a way t

Re: Tigris binary packages for Windows

Bojan Resnik wrote: Hi, We have a custom server setup and we have been using Tigris.org binaries for Windows. The latest version there, however, is 1.6.6. Will there be Tigris.org binary packages for Windows for Subversion 1.6.9 and later? Or perhaps an equivalent of these packages, with full

Re: Tigris binary packages for Windows

sNop wrote: Dne 1. 3. 2010 15:09, Olivier Sannier napsal(a): Bojan Resnik wrote: Hi, We have a custom server setup and we have been using Tigris.org binaries for Windows. The latest version there, however, is 1.6.6. Will there be Tigris.org binary packages for Windows for Subversion

Re: Tigris binary packages for Windows

Troy Simpson wrote: Hi, I can still build the installer, but I have never built binaries. The installer code in the repository is NOT the latest code. I had lost commit access for a time during the transition and by the time I got that access back there are no more binaries, so it has b

Re: Tigris binary packages for Windows

Troy Simpson wrote: For base-level support, we narrowed that down to apache 2.2x. Do we really need to support all the python builds? They were a great service from D.J. Heap, but now that we don't have that, do we really need to ditch all windows builds? What we could look at is a standard bas

Re: Tigris binary packages for Windows

Geoff Rowell wrote: sNop wrote on Wednesday, March 03, 2010 7:39 AM: Well, I, for one, would need the Apache 2.2 bindings but I do not need the Python bindings at all, which I suspect most users don't either. So basic binaries with 2.2 support would be perfect for starters The same

Re: Tigris binary packages for Windows

Yes, that's exactly what I had in mind. As to the "extract collabnet and repack" idea, I too am not sure if it would be allowed David Darj wrote: My plan was to build (for a start) what's included in the svn-win32-1.6.x.zip, Win32 binaries (svn, svnadmin, svnserve, svnmucc, etc...) both dor

Re: Windows binaries for 1.6.9

Chris Huseman wrote: Hello, I was wondering if the windows binary releases are still going to be maintained as they were for previous releases on tigris.org ? I ask because the most recent version available there (http://subversion.tigris.org/servlets/ProjectDocumentList?

Re: Tigris binary packages for Windows

David Darj wrote: On 2010-04-22 17:06, Cooke, Mark wrote: Folks, I am resurrecting this thread to ask if anyone has come forward to volunteer time and/or effort to resurrect the windoze binaries as we are still on 1.6.6 against 1.6.11 announced a few days ago. In hope... ~ Mark C I have

Re: Can we use relative paths in svn:externals propset?

David Bartmess wrote: I have two projects under a single repository, with A being dependent on B being checked out. To set the svn:externals propset, can I use a relative path for the checkout directory for the depending (B) directory? Such as : svn propset svn:externals "../buildsupport h

Re: Size of SVN Transaction vs Actual commit size

Ravi Roy wrote: Actual commit size is 1.28 MB and this script gives me 5528 bytes. Something wrong with script or there is compression involved or what ? Well, reading the book could have told you that this is expected: http://svnbook.red-bean.com/nightly/en/svn.reposadmin.maint.html#svn.repos