[SVN-563] 'svn up' should allow nonconflicting tree merges.

• Type: Improvement
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: all
• Fix Version/s: ---
• Component/s: src
• Assignee: Ben Collins-Sussman
• Reporter: Subversion Importer
• Created: 26/Nov/01 19:31
• Updated: 27/Oct/18 16:30
• Resolved: 29/Dec/12 23:28

Description

When I did an 'svn up' on my repository just now, I had a change (my PROPPATCH 
error patch) which was already made in my local repository, but it came up as 
a rejected patch rather than telling me that I had good forsight, like CVS 
would have done :-).

Original issue reported by saurik

Issue Links

• depends upon: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts
• is blocked by: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts