Re: Reintegrate-like merges and diff_ignore_ancestry

2013-01-31 Thread C. Michael Pilato
On 01/31/2013 06:15 PM, Bert Huijben wrote: > Shouldn't the svn_fs_contents_changed() just return the right value we need > here? svn_fs_contents_changed() was not designed to be used to detect when two files have different content, but really to detect when the contents of a given file have cha

Re: r1438683 - issue #4306 'multiple editor drive file merges record wrong mergeinfo during conflicts'

2013-01-31 Thread Julian Foad
Hi Paul.  Not sure about this... > URL: http://svn.apache.org/viewvc?rev=1438683&view=rev > Log: > Fix issue #4306 'multiple editor drive file merges record wrong mergeinfo > during conflicts'. > > * subversion/libsvn_client/merge.c >   (do_file_merge): If we can only perform a partial merge bec

RE: Reintegrate-like merges and diff_ignore_ancestry

2013-01-31 Thread Bert Huijben
> -Original Message- > From: Ivan Zhakov [mailto:i...@visualsvn.com] > Sent: donderdag 31 januari 2013 22:50 > To: Paul Burba; Bert Huijben > Cc: Julian Foad; Subversion Development > Subject: Re: Reintegrate-like merges and diff_ignore_ancestry > Thanks for demonstrating use-case. That

Re: Reintegrate-like merges and diff_ignore_ancestry

2013-01-31 Thread Ivan Zhakov
On Wed, Jan 23, 2013 at 9:39 PM, Paul Burba wrote: > On Wed, Jan 23, 2013 at 9:51 AM, Julian Foad > wrote: >> Ivan Zhakov wrote: >> >>> I was testing recent changes in ra_serf update editor and noticed that >>> reintegrate-like merges for long living branches are extremely slow. >>> Client reque

Re: Can we remove DAV-props/WC-props from the code now?

2013-01-31 Thread C. Michael Pilato
On 01/31/2013 02:11 PM, Greg Stein wrote: > For API compatibility purposes... no, they cannot be removed. > > We renamed them to "dav_cache", but the original APIs called them "WC > props" and never stated they might disappear. > > Unless you can find something that says they will disappear (as M

Re: svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Philip Martin
Stefan Sperling writes: > OK, I agree that it might not be obvious to someone who doesn't know > how blame actually works internally. It works by incrementally diffing > all revisions that changed the file to figure out which revision > contributed which line. Since a binary file doesn't have a n

Re: svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Ferenc Kovacs
On Thu, Jan 31, 2013 at 7:57 PM, Stefan Sperling wrote: > On Thu, Jan 31, 2013 at 07:35:07PM +0100, Ferenc Kovacs wrote: > > > I suppose we should improve Subversion's behaviour here by issuing a > > > warning if Subversion's own binary-file detection code doesn't identify > > > the file as binar

RE: svn commit: r1441125 - in /subversion/trunk/subversion: libsvn_wc/conflicts.c libsvn_wc/wc-queries.sql libsvn_wc/wc_db.h libsvn_wc/wc_db_update_move.c tests/libsvn_wc/op-depth-test.c

2013-01-31 Thread Bert Huijben
> -Original Message- > From: phi...@apache.org [mailto:phi...@apache.org] > Sent: donderdag 31 januari 2013 20:00 > To: comm...@subversion.apache.org > Subject: svn commit: r1441125 - in /subversion/trunk/subversion: > libsvn_wc/conflicts.c libsvn_wc/wc-queries.sql libsvn_wc/wc_db.h > lib

Re: Can we remove DAV-props/WC-props from the code now?

2013-01-31 Thread Greg Stein
For API compatibility purposes... no, they cannot be removed. We renamed them to "dav_cache", but the original APIs called them "WC props" and never stated they might disappear. Unless you can find something that says they will disappear (as Mike noted, a switch will invalidate them), then an API

Re: svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Stefan Sperling
On Thu, Jan 31, 2013 at 07:35:07PM +0100, Ferenc Kovacs wrote: > > I suppose we should improve Subversion's behaviour here by issuing a > > warning if Subversion's own binary-file detection code doesn't identify > > the file as binary when the user sets a binary mime-type. > > > > What do you think

Re: svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Ferenc Kovacs
On Thu, Jan 31, 2013 at 6:46 PM, Stefan Sperling wrote: > On Thu, Jan 31, 2013 at 06:36:09PM +0100, Stefan Sperling wrote: > > The book does indeed not seem to explicitly mention 'svn blame' in this > > context. I think that should be fixed. > > Filed an issue with cmpilato's consent: > http://co

Re: svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Ferenc Kovacs
On Thu, Jan 31, 2013 at 6:36 PM, Stefan Sperling wrote: > On Thu, Jan 31, 2013 at 05:51:53PM +0100, Ferenc Kovacs wrote: > > On Thu, Jan 31, 2013 at 5:17 PM, Stefan Sperling wrote: > > > At any revision, the entire file content could be swapped out and > binary > > > content be replaced with tex

Re: svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Stefan Sperling
On Thu, Jan 31, 2013 at 06:36:09PM +0100, Stefan Sperling wrote: > The book does indeed not seem to explicitly mention 'svn blame' in this > context. I think that should be fixed. Filed an issue with cmpilato's consent: http://code.google.com/p/svnbook/issues/detail?id=183

Re: svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Stefan Sperling
On Thu, Jan 31, 2013 at 05:51:53PM +0100, Ferenc Kovacs wrote: > On Thu, Jan 31, 2013 at 5:17 PM, Stefan Sperling wrote: > > At any revision, the entire file content could be swapped out and binary > > content be replaced with text and vice versa. In which case you'd set the > > property in some r

Re: svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Ferenc Kovacs
On Thu, Jan 31, 2013 at 5:17 PM, Stefan Sperling wrote: > On Thu, Jan 31, 2013 at 04:44:39PM +0100, Ferenc Kovacs wrote: > > I would be ok with shipping it in 1.8, and while I think that the > suggested > > wording is better than the current as it suggest a solution, but > personally > > I would

Re: svn commit: r1440966 - in /subversion/trunk/subversion: libsvn_client/merge.c tests/cmdline/merge_tests.py tests/cmdline/merge_tree_conflict_tests.py tests/cmdline/tree_conflict_tests.py

2013-01-31 Thread Paul Burba
On Thu, Jan 31, 2013 at 9:12 AM, wrote: > Author: rhuijben > Date: Thu Jan 31 14:12:53 2013 > New Revision: 1440966 > > URL: http://svn.apache.org/viewvc?rev=1440966&view=rev > Log: > In the merge handling: make the tree conflict detection for directories work > like that in the update editor: De

Re: svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Julian Foad
Stefan Sperling wrote: > Ferenc Kovacs wrote: >> It is really unintuitive to guess that blame doesn't work because the file >> HAD a binary mimetype in the past (and from a quick test it seems that the >> blame will be skipped even if the versions shown by blame all happened >> after the binary mim

Re: svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Stefan Sperling
On Thu, Jan 31, 2013 at 04:44:39PM +0100, Ferenc Kovacs wrote: > I would be ok with shipping it in 1.8, and while I think that the suggested > wording is better than the current as it suggest a solution, but personally > I would be still confused why would subversion treat my file as binary > while

Re: svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Ferenc Kovacs
On Thu, Jan 31, 2013 at 4:30 PM, Stefan Sperling wrote: > On Thu, Jan 31, 2013 at 01:57:16PM +0100, Ferenc Kovacs wrote: > > Hi, > > > > I would like to bring up an old issue here: > > http://subversion.tigris.org/issues/show_bug.cgi?id=2089 > > I've just bumped into this, and first it was really

Re: [OPW] Introducing the 2013 Apache Subversion Intern

2013-01-31 Thread C. Michael Pilato
On 01/31/2013 07:54 AM, Nico Kadel-Garcia wrote: > Although, there is something disturbing about the description"Gnome > Woman" initiative. It's difficult not to picture short women with red > caps and well groomed beards, one on every lawn in a suburb, mandated > by their local housing association

Re: svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Stefan Sperling
On Thu, Jan 31, 2013 at 01:57:16PM +0100, Ferenc Kovacs wrote: > Hi, > > I would like to bring up an old issue here: > http://subversion.tigris.org/issues/show_bug.cgi?id=2089 > I've just bumped into this, and first it was really confusing why would svn > blame work with one xml file, but not with

svn blame not working for files which had binary mime-type in a previous revision

2013-01-31 Thread Ferenc Kovacs
Hi, I would like to bring up an old issue here: http://subversion.tigris.org/issues/show_bug.cgi?id=2089 I've just bumped into this, and first it was really confusing why would svn blame work with one xml file, but not with the other, as the Skipping binary file: 'reference/apc/book.xml' wasn't re

Re: [OPW] Introducing the 2013 Apache Subversion Intern

2013-01-31 Thread Nico Kadel-Garcia
On Thu, Jan 31, 2013 at 7:24 AM, Gabriela Gibson wrote: > Hi everyone, > > I am the current Gnome Outreach Program for Women intern for the > Apache Subversion project, sponsored by Elego, Berlin, Germany. > > OPW is a GNOME Woman initiative that aims to inspire women to > contribute to Free Softw

[PATCH] Small fixes to the Perl bindings

2013-01-31 Thread roderich.sch...@gmail.com
Hi, while trying to use svn_wc_parse_externals_description3 from Perl I stumbled over a fex things. Patches below are against trunk. perl-bindings-1.patch [[[ Make svn_wc_parse_externals_description3 available from Perl bindings. * subversion/bindings/swig/include/svn_containers.swg: Add out

[OPW] Introducing the 2013 Apache Subversion Intern

2013-01-31 Thread Gabriela Gibson
Hi everyone, I am the current Gnome Outreach Program for Women intern for the Apache Subversion project, sponsored by Elego, Berlin, Germany. OPW is a GNOME Woman initiative that aims to inspire women to contribute to Free Software projects. A short introduction to my official goals for the Apa

Re: Can we remove DAV-props/WC-props from the code now?

2013-01-31 Thread Ivan Zhakov
On Thu, Jan 31, 2013 at 3:28 PM, Bert Huijben wrote: > > >> -Original Message- >> From: Ivan Zhakov [mailto:i...@visualsvn.com] >> Sent: donderdag 31 januari 2013 11:56 >> To: C. Michael Pilato >> Cc: Julian Foad; Subversion Development; BertHuijben >> Subject: Re: Can we remove DAV-props/

RE: Can we remove DAV-props/WC-props from the code now?

2013-01-31 Thread Bert Huijben
> -Original Message- > From: Ivan Zhakov [mailto:i...@visualsvn.com] > Sent: donderdag 31 januari 2013 11:56 > To: C. Michael Pilato > Cc: Julian Foad; Subversion Development; BertHuijben > Subject: Re: Can we remove DAV-props/WC-props from the code now? > > On Thu, Jan 31, 2013 at 12:18

Re: Can we remove DAV-props/WC-props from the code now?

2013-01-31 Thread Ivan Zhakov
On Thu, Jan 31, 2013 at 12:18 AM, Ivan Zhakov wrote: > On Wed, Jan 30, 2013 at 10:20 PM, C. Michael Pilato > wrote: >> On 01/30/2013 11:46 AM, Julian Foad wrote: >>> It would be awesome if we can now completely remove the code supporting >>> 'DAV props' aka 'WC props' in the client side, if it i