On Sat, Nov 3, 2012 at 9:33 AM, Stefan Sperling <stsp_at_elego.de> wrote:
> On Fri, Nov 02, 2012 at 06:00:52PM -0400, Paul Burba wrote:
>> These six XFailing upate tests are all part of this effort correct?
>>
>> 61 XFAIL update locally moved dir with leaf del
>> 62 XFAIL update locally moved dir with edited leaf del
>> 63 XFAIL update locally moved dir with incoming file
>> 64 XFAIL update locally moved dir with incoming dir
>
> I believe the above date back to 1.6. They verify that tree
> conflict detection works correctly.
>
> I might have changed them since 1.7 was branched to account
> for some changes I made. I'll look into that next week.
Great, thanks!
>> 67 XFAIL text mod to moved files
>> 68 XFAIL text mod to moved file in moved dir
>>
>> If so, is there an umbrella issue we can associate them with?
>
> There is no specific issue filed for our desire to improve
> handling of tree-conflicts with local moves on update,
> though that's a goal Philip and I have in mind for 1.8.
>
> I believe from a high-level perspective these could be considered
> part of issue #3144, "interactive conflict resolution does not
> know about tree-conflicts"
> http://subversion.tigris.org/issues/show_bug.cgi?id=3144
>
> Or we could associate them with the umbrella "moves" issue:
> http://subversion.tigris.org/issues/show_bug.cgi?id=3630
>
> Or perhaps we should re-open #3631 and associate them with that?
> http://subversion.tigris.org/issues/show_bug.cgi?id=3631
I associated #67 and #68 with both issue #3144 and issue #3630 as they
both seem to apply. The former issue is listed as 1.8-consider (the
latter is unscheduled). I'm under (the possibly mistaken) impression
that the tree-conflicts with local moves on update work isn't a
blocker for 1.8...at least not yet.
--
Paul T. Burba
CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development
Skype: ptburba
Received on 2012-11-06 21:38:20 CET