[SVN-3318] Tree conflict raised by a null difference

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Won't Fix
• Affects Version/s: trunk
• Fix Version/s: unscheduled
• Component/s: unknown
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Julian Foad
• Created: 12/Nov/08 13:04
• Updated: 27/Oct/18 16:28
• Resolved: 29/Dec/12 23:06

Description

If a file's content changes from A to B to A, then the overall change (which is
no change) can still be detected as a "change" and raise a tree conflict. This
should be prevented, in line with Subversion's philosophy of merging that the
incoming change is simply a diff, not a set of semantic changes.

Issue Links

• depends upon: SVN-3334 Tree conflict merry-go-round on update/switch
• is blocked by: SVN-3334 Tree conflict merry-go-round on update/switch