[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Fix for issue 3067

From: Blair Zajac <blair_at_orcaware.com>
Date: Wed, 11 Jun 2008 08:29:21 -0700

Paul Burba wrote:
> On Fri, May 9, 2008 at 12:02 PM, Kamesh Jayachandran <kamesh_at_collab.net> wrote:
>> Hi All,
>> I hereby attach the fix to issue 3067.
>> I am bit skeptical about performance of 'guess_live_ranges' in this patch.
>> But it would perform poorly only for the situations when
>> merge_src_subtree_at_revision2 does not exist and that too for one invocation.
>> Would like to know what others would think about it.
>> Thanks
>> With regards
>> Kamesh Jayachandran
> Hi Kamesh,
> Sorry for the long delay, while working on this I've found other
> related problems (issue #3199 and #3157) that needed to be addressed
> first. But *finally* I reworked our patch, using a simpler approach
> that avoids the round trip overhead of guess_live_ranges() entirely.
> But first I should mention a few things:

Hi Paul,

Mark pointed me to this issue with a potential fix for merging bug I'm running
into on the file-externals branch. I just applied this patch to trunk_at_31704 and
with the following commands, I get a failed merge.

$ svn --version
svn, version 1.6.0 (dev build)
    compiled Jun 11 2008, 08:09:37

$ svn co http://svn.collab.net/repos/svn/branches/file-externals@31704
$ cd file-externals
$ svn merge http://svn.collab.net/repos/svn/trunk
subversion/libsvn_ra_neon/util.c:722: (apr_err=160013)
svn: Working copy path 'www/tasks.html' does not exist in repository

The branch has seen no original commits and only a few merge commits from trunk.

I'm going to be deleting this branch and re-copying it so I can progress on my
work since this branch has no original commits, but using the peg revision to
check out should still be a good test case for the merging code.


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-11 17:29:40 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.