You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Neels Janosch Hofmeyr <ne...@elego.de> on 2009/08/22 00:47:01 UTC
Re: svn commit: r38907 - in trunk/subversion: libsvn_client
libsvn_wc tests/cmdline
Stefan Sperling wrote:
> Author: stsp
> Date: Fri Aug 21 13:57:01 2009
> New Revision: 38907
>
> Log:
> Use conflict action and reason types for replaced items added in r38903
> when flagging and reporting tree conflicts during update and merge.
w00t!
Guys, I see you've been quite busy on this one while I was away. I'll try
and see what needs to be done to finish this one off.
Thanks, Julian, Stephen, for spotting the bogus merge in merge_tests.py.
BTW, is it possible to backport the addition of the 'replaced' action/reason
to 1.6.x?
I'm trying to keep track of which revisions would need to be backported...
r38000, r38006, r38099, r38100, r38181,
r38803, r38872, r38896, r38903, 38907
where r38872 has already been nominated.
~Neels
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2386180
Re: svn commit: r38907 - in trunk/subversion: libsvn_client
libsvn_wc tests/cmdline
Posted by Stefan Sperling <st...@elego.de>.
On Sun, Aug 23, 2009 at 01:39:20AM +0200, Neels J Hofmeyr wrote:
> Hyrum K. Wright wrote:
> >> BTW, is it possible to backport the addition of the 'replaced'
> >> action/reason
> >> to 1.6.x?
> >
> > I could be wrong, but I think those values are considered part of the
> > public API, and therefore shouldn't be added in a patch release.
>
> Indeed, no way denying it. Humph.
> So to fix this in 1.6.x, we need a "half-fix" on a branch.
My plan for 1.6.x was to add new conflict_{action,reason}_t types in
include/private somewhere and use them instead of the public ones.
As soon as we're happy with what we've got on trunk, I am going to make
a backport branch and merge all required revisions into it.
Stefan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2386515
Re: svn commit: r38907 - in trunk/subversion: libsvn_client
libsvn_wc tests/cmdline
Posted by Neels Janosch Hofmeyr <ne...@elego.de>.
Hyrum K. Wright wrote:
>> BTW, is it possible to backport the addition of the 'replaced'
>> action/reason
>> to 1.6.x?
>
> I could be wrong, but I think those values are considered part of the
> public API, and therefore shouldn't be added in a patch release.
Indeed, no way denying it. Humph.
So to fix this in 1.6.x, we need a "half-fix" on a branch.
~Neels
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2386399
Re: svn commit: r38907 - in trunk/subversion: libsvn_client
libsvn_wc tests/cmdline
Posted by "Hyrum K. Wright" <hy...@hyrumwright.org>.
On Aug 22, 2009, at 2:47 AM, Neels Janosch Hofmeyr wrote:
> Stefan Sperling wrote:
>> Author: stsp
>> Date: Fri Aug 21 13:57:01 2009
>> New Revision: 38907
>>
>> Log:
>> Use conflict action and reason types for replaced items added in
>> r38903
>> when flagging and reporting tree conflicts during update and merge.
>
> w00t!
>
> Guys, I see you've been quite busy on this one while I was away.
> I'll try
> and see what needs to be done to finish this one off.
>
> Thanks, Julian, Stephen, for spotting the bogus merge in
> merge_tests.py.
>
> BTW, is it possible to backport the addition of the 'replaced'
> action/reason
> to 1.6.x?
I could be wrong, but I think those values are considered part of the
public API, and therefore shouldn't be added in a patch release.
>
> I'm trying to keep track of which revisions would need to be
> backported...
>
> r38000, r38006, r38099, r38100, r38181,
> r38803, r38872, r38896, r38903, 38907
>
> where r38872 has already been nominated.
>
> ~Neels
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2386180
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2386236