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.
> 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"
Or we could associate them with the umbrella "moves" issue:
Or perhaps we should re-open #3631 and associate them with that?
Received on 2012-11-03 14:34:40 CET