[SVN-1425] make 'svn merge' less fragile

• Type: Bug
• Status: Closed
• Priority: Critical
• Resolution: Fixed
• Affects Version/s: all
• Fix Version/s: 0.29
• Component/s: libsvn_client

Environment

other

• Assignee: Unassigned
• Reporter: Ben Collins-Sussman
• Created: 17/Jul/03 21:55
• Updated: 27/Oct/18 16:38
• Resolved: 15/Sep/04 08:43

Description

We have a general problem that 'svn merge' dies too easily.  This
command should behave much like 'patch' -- that is, if a hunk of tree
delta fails to apply, just warn the user, and move on.  

Here's my personal list of "fragility" bugs in svn merge.  Most of
them have now been taken care of, but a few remain:

* make sure no-op merges aren't printed at all.  [fixed in issue 1379,
r6452]. 

* missing files and dirs show 'skip' messages [fixed in issue 1399, r6500]

* adding files:  ra_dav->get_uuid was causing svn_client_copy(URL, wc)
  to fail, which 'svn merge' depended on. [fixed in issue 1419, r6495]

* deletions: if item already missing, print 'skip' instead of 'D'
  [fixed in r6503]

* deal with unversioned obstructions: what if merge wants to
  add/delete/change something that is unversioned?  Just keep going,
  print 'skipped unversioned target', rather than bombing out as it
currently does.


For now, this issue is about fixing the last bullet item.