On Fri, 2008-08-08 at 11:53 +0100, Julian Foad wrote:
> On Thu, 2008-08-07 at 19:47 -0400, Paul Burba wrote:
> > On Thu, Aug 7, 2008 at 7:34 AM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
> > > On Wed, 2008-08-06 at 17:53 -0400, Paul Burba wrote:
> > I think you can commit it and mark merge_tests.py 77 as XFail (with a
> > link to this thread in the test's comments). I'm still fairly certain
Oops, I forgot to add a link to this thread... r32407.
> > I can tweak the 3067-related code to work with it (though I still
> > haven't quite got it working)...
>
> Phew. Thanks. I can't commit until the comparison accounts for
> "translation" (keywords, line endings) between repository-normal form
> and working-copy form, but that's what I'm doing now.
Done and committed in r32405.
I must declare that this makes a semantic change to all the
svn_client_merge3() family of APIs. I recently told someone they
couldn't do that, and I should tell myself I can't do this. Instead, I
should create a new set of APIs with the new semantics and preserve the
old semantics on the old ones, as third-party tool authors might be
relying on the behaviour.
The API functions affected are
svn_client_merge/2/3()
svn_client_merge_reintegrate()
svn_client_merge_peg/2/3()
The changes required to do preserve the old semantics are:
New API revs:
svn_client_merge4()
svn_client_merge_reintegrate2()
svn_client_merge_peg4()
Add some flag into the merge baton that the implementation uses,
and use it to select "old" or "new" behaviour in merge_file_deleted().
Do folks think this needs to be done, or is the change enough of a
harmless one that we're OK with it?
Personally, I think we (I) should rev the APIs to maintain the old
behaviour, but I'm asking as I don't like to do the extra work if it's
not necessary.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-08 18:53:31 CEST