Re: Moved file resolution fails

2024-02-02 Thread Stanimir Stamenkov via users
Fri, 2 Feb 2024, /Johan Corveleyn/: On Fri, Feb 2, 2024 at 10:18 AM Stanimir Stamenkov via users wrote: * Tree conflicts flagged by svn merge cannot be automatically resolved yet. This will be addressed in a future release. If I understand correctly, not much has changed related

Re: Moved file resolution fails

2024-02-02 Thread Stanimir Stamenkov via users
Fri, 2 Feb 2024, /Sands, Daniel N./: As far as I'm aware this is all client-side behavior - nothing to do with the server. Resource move/rename has always been recorded as a _Delete_ of the original path and a _Copy_ (Add) from the previous path revision. It could be I'm missing something

Re: Moved file resolution fails

2024-01-30 Thread Stanimir Stamenkov via users
Tue, 30 Jan 2024, /Sands, Daniel N./: So far I have not found a use case where moved file resolution in 1.8+ works as advertised on 1.7 servers.  But more specifically, I have the following case: The trunk has a directory, /foo/bar In my local branch, I have relocated bar to /baz/bar

Re: Upgrade Subversion 1.13 to 1.14 LTS ( Ubuntu 20.04.5)

2023-11-01 Thread Stanimir Stamenkov via users
Wed, 1 Nov 2023 20:36:17 +0530, /JITHIN K/: The Subversion version in my Ubuntu server is 1.13.0-3ubuntu0.2 and when I check the change log https://changelogs.ubuntu.com/changelogs/pool/universe/s/subversion/subversion_1.13.0-3ubuntu0.2/changelog I could see that security update for

Re: Revision/History Graph - DAG (Directed Acyclic Graph)

2012-05-01 Thread Stanimir Stamenkov
Tue, 1 May 2012 09:21:39 +0200, /Thorsten Schöning/: Guten Tag Stanimir Stamenkov, am Dienstag, 1. Mai 2012 um 01:14 schrieben Sie: Is anyone aware of tools which (re)construct a DAG from Subversion repository history and display it pretty much like today's DVCSes? Did you already look

Revision/History Graph - DAG (Directed Acyclic Graph)

2012-04-30 Thread Stanimir Stamenkov
Is anyone aware of tools which (re)construct a DAG from Subversion repository history and display it pretty much like today's DVCSes? For example: http://code.google.com/a/eclipselabs.org/p/mercurialeclipse/source/list?r=ee7ed7ec51606117613924d0662fc03086787450

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

2011-05-24 Thread Stanimir Stamenkov
Tue, 24 May 2011 10:45:09 -0400, /David Tombs/: I created the same directory, called 'config' on two branches. The directory had different files on each branch, let's call them 'foo.java' on branch A and 'bar.java' on branch B. When I merged branch A - branch B, I got a tree conflict saying

Re: Maven, Subversion and Eclipse issue

2011-05-09 Thread Stanimir Stamenkov
Mon, 9 May 2011 08:07:10 -0700 (PDT), /Refr Bruhl/: Mon, 9 May 2011 15:56:14 +0100, /Brian Smith/: We set the following on each module's trunk: $ svn ps svn:ignore core target .project .classpath .settings So that is manual svn command outside of eclipse? I'll give it a shot. Thank you!

Dump filter correcting EOL style

2011-04-22 Thread Stanimir Stamenkov
Is anyone aware of repository dump filter [1] which corrects the EOL style of files, by initializing their svn:eol-style property in their first revision according to the [auto-props] section [2], and then correcting the EOL style in their content according to the svn:eol-style value? I've

Re: Dump filter correcting EOL style

2011-04-22 Thread Stanimir Stamenkov
Fri, 22 Apr 2011 15:29:04 +0300, /Daniel Shahaf/: Stanimir Stamenkov wrote on Fri, Apr 22, 2011 at 14:36:53 +0300: Is anyone aware of repository dump filter [1] which corrects the EOL Not me, but sounds like a one-off patch (to the Create a new file logics of 'load' or 'svnsync') could do

svn diff / blame -x --ignore-space-change doesn't ignore EOL style changes

2011-04-20 Thread Stanimir Stamenkov
The '--ignore-space-change' option, and '--ignore-all-space' for that matter, to the 'diff' and 'blame' commands doesn't seem to ignore changes in the EOL style. I really expect each of: --ignore-eol-style --ignore-space-change --ignore-all-space in the given order to include the effect of

Re: svn diff / blame -x --ignore-space-change doesn't ignore EOL style changes

2011-04-20 Thread Stanimir Stamenkov
Wed, 20 Apr 2011 21:38:55 +0200, /Johan Corveleyn/: On Wed, Apr 20, 2011 at 8:03 PM, Daniel Shahaf wrote: AIUI, --ignore-eol-style + --ignore-space-change == --ignore-all-space. It seems to me that --ignore-all-space would work for your use case? No, I don't think that's correct.

Re: Periodically merge between trunk-branch and branch-trunk

2010-12-13 Thread Stanimir Stamenkov
Mon, 13 Dec 2010 07:33:07 +0100, /Daniel Albuschat/: 2010/12/11 Stanimir Stamenkov s7a...@netscape.net: Thu, 9 Dec 2010 12:46:14 +0100, /Daniel Albuschat/: Currently the only solution I see is to reintegrate the branch to trunk and then re-create the branch. This has the shortcoming that all

Re: Merge branch from trunk into newer branch from trunk, resolving directory conflicts

2010-12-05 Thread Stanimir Stamenkov
Thu, 2 Dec 2010 01:50:09 -0500, /derek fong/: (...) [f...@localhost] ~/sandbox/temp/_merged/repo: svn stat C . ? dir_conflicts.prej ! C application local delete, incoming edit upon merge I think I understand why that's happening, but what's the best way for me

svn log -g --xml doesn't include Merged via info

2010-12-05 Thread Stanimir Stamenkov
Issuing 'svn log -g -q' I get an output like: r8 | ... r7 | ... Merged via: r8

Re: svn log -g --xml doesn't include Merged via info

2010-12-05 Thread Stanimir Stamenkov
Mon, 6 Dec 2010 09:48:50 +1000, /Daniel Becroft/: On Mon, Dec 6, 2010 at 6:52 AM, Stanimir Stamenkov s7a...@netscape.net wrote: (...) However issuing 'svn log -g --xml -q' (even 'svn log -g --xml -v') doesn't seem to provide the Merged via revision info. Is it currently possible to get

Make svn diff produce output for new files added on another branch

2010-11-20 Thread Stanimir Stamenkov
After merging changes from a branch different from the working one I could get files added on that other branch, and the svn stat would look like: M . A +a_new_file Issuing svn diff at this point doesn't include the a_new_file content in the output. Could svn diff be instructed to

Re: Make svn diff produce output for new files added on another branch

2010-11-20 Thread Stanimir Stamenkov
Sat, 20 Nov 2010 23:55:51 +0200, /Stanimir Stamenkov/: Similarly, when working on a feature branch and periodically syncing with trunk (for example) I often like to compare what I've got changed on the branch (whether the merge hasn't gone bad, e.g. after resolving conflicts) before committing

Re: Use of kdiff3

2010-11-08 Thread Stanimir Stamenkov
Mon, 8 Nov 2010 11:52:27 +, /Giulio Troccoli/: Lots of people here use either TortoiseMerge or WinMerge for conflict resolution. But now I have a requirement to provide something similar for a Linux platform and I thought of kdiff3. I there anyone else that uses as well? I have install it

Re: Mailing lists? Really?

2010-07-28 Thread Stanimir Stamenkov
Wed, 28 Jul 2010 11:13:26 -0700, /Ds Jstc/: I want to search for solutions, complain about my favorite missing features, and reply to other people's problems when I've already solved them. Search for solutions in the archives: http://subversion.apache.org/mailing-lists.html You may even

Re: libsvn_ra_neon-1.so.0: undefined symbol: GENERAL_NAME_free

2010-07-20 Thread Stanimir Stamenkov
20.7.2010 г. 14:32 +0300, /Angel Tsankov/: When I run kdesvn I get a dialog showing the following message: Could not find our part: Cannot load library /usr/lib/kde4/kdesvnpart.so: (/usr/lib/libsvn_ra_neon-1.so.0: undefined symbol: GENERAL_NAME_free) Files /usr/lib/kde4/kdesvnpart.so and

Re: Choosing svn or git for small scale projects?

2010-05-24 Thread Stanimir Stamenkov
Mon, 24 May 2010 23:33:12 +0300, /Stanimir Stamenkov/: Mon, 24 May 2010 15:02:31 -0500, /Peng Yu/: Does svn offer all the capability that gits offer in terms of branching and merging (ignoring performance issues)? http://stackoverflow.com/questions/2475831/merging-hg-git-vs-svn/2477089

Re: Choosing svn or git for small scale projects?

2010-05-24 Thread Stanimir Stamenkov
Mon, 24 May 2010 17:49:22 -0400, /David Weintraub/: Many people think that Git MUST be better because Linus Tolvards uses it. But, that's mainly because of the way the Linux project operates. I've had developers tell me how much better Git is when they work with on their own one-man projects

Re: SVN Binary

2010-05-09 Thread Stanimir Stamenkov
Sun, 9 May 2010 16:56:10 +0800, /Michael Sync/: Here is the list of sites that shares the binary of SVN for Windows platform. I'm trying to download Subversion ( just subversion not other clients) from those links. I got this error This webpage has a redirect loop from both Tigris.org

Re: How do I use ^ in command-line paths?

2010-05-07 Thread Stanimir Stamenkov
Fri, 7 May 2010 07:07:41 -0700 (PDT), /tstone-barcard/: The SVN Book uses a path syntax throughout the narrative that prefixes a ^. I'm continually baffled by the use of ^ in the svn-book (http://svnbook.red-bean.com) because I cannot get it to work. What is this shortcut? When does it work?

Re: Subversion update bug ?

2010-04-26 Thread Stanimir Stamenkov
Mon, 26 Apr 2010 16:34:28 -0400, /Phil Pinkerton/: svn 1.6.5 while in a working copy I modified a file for testing. After testing I wanted to update the file I modified in the working copy to the version in the repository. the resulting update did not replace the files in the working copy

Re: How to determine the source of a copy

2010-04-03 Thread Stanimir Stamenkov
Tue, 30 Mar 2010 13:18:14 -0430, /Brian Mearns/: Various client tools seem to know what path and revision a copy was created from (e.g., Tortoise's revision graph). Can the svn command line tool get me this information? Is there anyway I can get this from a hook script? Not sure if this

svn stat - show source of copied files

2010-03-31 Thread Stanimir Stamenkov
I'm trying to determine the source of an added file after rename, for example, prior the changes are committed. Is it possible? I have not been able to find out how using the stat command. All I get is the + indicator: svn stat A +path/to/myfile D myfile FWIW, I've seen this

Re: Spurious svn:mergeinfo updated on random, untouched files on minimalistic merge?! -- SOLVED !!!

2010-03-31 Thread Stanimir Stamenkov
Wed, 31 Mar 2010 16:22:37 +0200, /Ben/: My problem was not any existing svn:mergeinfos. Neither the source nor the target contained *any* svn:mergeinfo except one at the target root. But I finally found the solution! My problem was: *svnversion reported 3128P* I have no clue how this