Re: Reintegrate-like merges and diff_ignore_ancestry

2013-02-05 Thread Ivan Zhakov
On Fri, Feb 1, 2013 at 3:57 PM, Ivan Zhakov wrote: > On Fri, Feb 1, 2013 at 1:49 AM, Ivan Zhakov wrote: >> 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 u

Re: Reintegrate-like merges and diff_ignore_ancestry

2013-02-01 Thread Ivan Zhakov
On Fri, Feb 1, 2013 at 1:49 AM, Ivan Zhakov wrote: > 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 f

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: 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 demonst

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: Reintegrate-like merges and diff_ignore_ancestry

2013-01-23 Thread Paul Burba
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 requests server for diff between branches with respect to >> ancest

RE: Reintegrate-like merges and diff_ignore_ancestry

2013-01-23 Thread Bert Huijben
> -Original Message- > From: Ivan Zhakov [mailto:i...@visualsvn.com] > Sent: woensdag 23 januari 2013 14:03 > To: Subversion Development > Subject: Reintegrate-like merges and diff_ignore_ancestry > > Hi, > > I was testing recent changes in ra_serf update editor and noticed that > reint

Re: Reintegrate-like merges and diff_ignore_ancestry

2013-01-23 Thread Julian Foad
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 requests server for diff between branches with respect to > ancestry and servers reports no-op txdelta for every file that was