RE: Presentation for Berlin 10-13 June - "The future of merging with Subversion"

2010-05-28 Thread Bert Huijben
> -Original Message- > From: C. Michael Pilato [mailto:cmpil...@collab.net] > Sent: vrijdag 28 mei 2010 5:53 > To: Julian Foad > Cc: Subversion Development > Subject: Re: Presentation for Berlin 10-13 June - "The future of merging with > Subversion" > > C. Michael Pilato wrote: > > Julia

Rename tracking [was: Presentation for Berlin 10-13 June - "The future of merging with Subversion"]

2010-05-28 Thread Julian Foad
(Skip to the end: I've just discovered issue #3630 "Rename tracking" and its dependants, and will read them. I think "Rename tracking" is a good name. The rest of this reply is now mostly a curiosity.) C. Michael Pilato wrote: > C. Michael Pilato wrote: > > Julian Foad wrote: > >> Did you mean

Re: Rename tracking [was: Presentation for Berlin 10-13 June - "The future of merging with Subversion"]

2010-05-28 Thread Stefan Sperling
On Fri, May 28, 2010 at 12:14:13PM +0100, Julian Foad wrote: > Ah, you see, I had somehow formed the impression that the phrase is now > used to mean "Handle renames in such a way that the end result is what > the users expect, regardless of how it's implemented". > > What the users expect has lit

Re: Rename tracking [was: Presentation for Berlin 10-13 June - "The future of merging with Subversion"]

2010-05-28 Thread Stefan Sperling
On Fri, May 28, 2010 at 02:07:15PM +0200, Stefan Sperling wrote: > Please consider taking a very good look at how Mercurial handles copies > when merging. And BTW, a rename in Mercurial is also a copy+delete. That's why I think what they are doing is quite relevant to us. Stefan

short alias for --force-internal-diff? (was: Re: svn commit: r949113 - in /subversion/trunk/subversion: svn/log-cmd.c svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout)

2010-05-28 Thread Stefan Sperling
On Fri, May 28, 2010 at 06:38:32AM -, style...@apache.org wrote: > Author: stylesen > Date: Fri May 28 06:38:31 2010 > New Revision: 949113 > > URL: http://svn.apache.org/viewvc?rev=949113&view=rev > Log: > Introduce '--force-internal-diff' option for 'svn log' command. Do we want to add a sh

Re: short alias for --force-internal-diff?

2010-05-28 Thread Stefan Küng
On 28.05.2010 14:41, Stefan Sperling wrote: On Fri, May 28, 2010 at 06:38:32AM -, style...@apache.org wrote: Author: stylesen Date: Fri May 28 06:38:31 2010 New Revision: 949113 URL: http://svn.apache.org/viewvc?rev=949113&view=rev Log: Introduce '--force-internal-diff' option for 'svn log'

Re: Rename tracking [was: Presentation for Berlin 10-13 June - "The future of merging with Subversion"]

2010-05-28 Thread Johan Corveleyn
On Fri, May 28, 2010 at 2:11 PM, Stefan Sperling wrote: > On Fri, May 28, 2010 at 02:07:15PM +0200, Stefan Sperling wrote: >> Please consider taking a very good look at how Mercurial handles copies >> when merging. > > And BTW, a rename in Mercurial is also a copy+delete. > That's why I think what

Re: Rename tracking [was: Presentation for Berlin 10-13 June - "The future of merging with Subversion"]

2010-05-28 Thread Julian Foad
Johan Corveleyn wrote: > On Fri, May 28, 2010 at 2:11 PM, Stefan Sperling wrote: > > On Fri, May 28, 2010 at 02:07:15PM +0200, Stefan Sperling wrote: > >> Please consider taking a very good look at how Mercurial handles copies > >> when merging. > > > > And BTW, a rename in Mercurial is also a cop

Re: Rename tracking [was: Presentation for Berlin 10-13 June - "The future of merging with Subversion"]

2010-05-28 Thread Mark Mielke
On 05/28/2010 09:33 AM, Johan Corveleyn wrote: Please don't reduce the issue of "rename tracking" (or whatever you want to call it) to merging. It's just as relevant for updating (cf. tree conflicts of "local edit, incoming delete" and "local delete, incoming edit", etc., which you can just as ea

Re: short alias for --force-internal-diff?

2010-05-28 Thread Philip Martin
Stefan Küng writes: > Where does 'svn log' do a diff? 'svn log' recently gained a --show-diff option. -- Philip

Re: svn aix subversion-1.5.4 issue

2010-05-28 Thread Peter Samuelson
[Morales, Pedro] > Getting the following error after install svn 1.5.4 on aix server: > Just running "svn help": >Could not load program svn: >Dependent module libsvn_client-1.so could not be loaded. >Could not load module libsvn_client-1.so. This is a Subversion usage question, not

Re: short alias for --force-internal-diff?

2010-05-28 Thread Julian Foad
On Fri, 2010-05-28, Stefan Küng wrote: > On 28.05.2010 14:41, Stefan Sperling wrote: > > On Fri, May 28, 2010 at 06:38:32AM -, style...@apache.org wrote: > >> Author: stylesen > >> Date: Fri May 28 06:38:31 2010 > >> New Revision: 949113 > >> > >> URL: http://svn.apache.org/viewvc?rev=949113&vi

Re: short alias for --force-internal-diff?

2010-05-28 Thread Stefan Küng
On 28.05.2010 15:44, Philip Martin wrote: Stefan Küng writes: Where does 'svn log' do a diff? 'svn log' recently gained a --show-diff option. Ah, I was looking at svn_client_log5 and couldn't find anything diff related, and there's no svn_client_log6. But now I see that this feature is i

Re: short alias for --force-internal-diff?

2010-05-28 Thread Stefan Sperling
On Fri, May 28, 2010 at 03:30:40PM +0200, Stefan Küng wrote: > I don't understand why this option is necessary for 'svn log'? > Where does 'svn log' do a diff? It does now, in trunk, as of a few days ago. $ svn help log [...] --show-diff : produce diff output

A notification framework for libsvn_repos

2010-05-28 Thread Hyrum K. Wright
In poking around libsvn_repos lately, I've found a somewhat neglected corner of the library: the notification system. Several functions return notifications back to the caller (typically 'svnadmin'), but they all use different callback types. In the case of svn_repos_load_fs2(), the output is gen

Re: short alias for --force-internal-diff?

2010-05-28 Thread Stefan Sperling
On Fri, May 28, 2010 at 02:47:23PM +0100, Julian Foad wrote: > The word "force" does not need to be part of the name, any more than we > need to write "--force-interactive" or "--force-non-recursive" or > "--force-revision=REV". +1 > I would have thought "--diff-cmd=" would be a good UI for overr

Re: short alias for --force-internal-diff?

2010-05-28 Thread Julian Foad
On Fri, 2010-05-28 at 17:46 +0200, Stefan Sperling wrote: > On Fri, May 28, 2010 at 02:47:23PM +0100, Julian Foad wrote: > > The word "force" does not need to be part of the name, any more than we > > need to write "--force-interactive" or "--force-non-recursive" or > > "--force-revision=REV". > >

Re: Rename tracking - client side

2010-05-28 Thread Julian Foad
I (Julian Foad) wrote: > [...] I've just discovered issue #3630 "Rename tracking" and > its dependants, and will read them. I think "Rename tracking" is a good > name. [...] I made a start on documenting what's needed for the client side of rename tracking (issue #3631): [[[ * notes/rename-track

Re: svn aix subversion-1.5.4 issue

2010-05-28 Thread Martin Furter
Hello Pedro It wasn't able to find the library (or AIX seems to call them modules) libsvn_client-1.so . It probably expects them to be in /opt/subversion-1.5.4/lib . The following command shows the libraries svn uses and where it found them, I guess it shows that it can't find all libsvn_*

Re: Rename tracking [was: Presentation for Berlin 10-13 June - "The future of merging with Subversion"]

2010-05-28 Thread C. Michael Pilato
Stefan Sperling wrote: > On Fri, May 28, 2010 at 02:07:15PM +0200, Stefan Sperling wrote: >> Please consider taking a very good look at how Mercurial handles copies >> when merging. > > And BTW, a rename in Mercurial is also a copy+delete. > That's why I think what they are doing is quite relevant

Re: A notification framework for libsvn_repos

2010-05-28 Thread Hyrum K. Wright
On Fri, May 28, 2010 at 10:22 AM, Hyrum K. Wright < hyrum_wri...@mail.utexas.edu> wrote: > In poking around libsvn_repos lately, I've found a somewhat neglected > corner of the library: the notification system. Several functions return > notifications back to the caller (typically 'svnadmin'), bu

Re: Rename tracking - client side

2010-05-28 Thread Peter Samuelson
[Julian Foad] > 2. Behaviour of Local Renames > D. Other WC commands > > - copy from source path: fail (can't reference a gone-away node) > > - copy from target path: record as copy of that target path? (can we > guarantee ordering such that that will be propagated

Re: Rename tracking - client side

2010-05-28 Thread Peter Samuelson
[Julian Foad] > 1. Introduction > > B. What is New? > > The rename operation can be viewed as having two halves - removal > from the source path, and adding or copying to the target path - but > unlike in previous versions of Subversion, these two actions are: > >