Checkout
kfogel
committed
on 03 Nov 08
On the issue-2843-dev branch: bring up-to-date with trunk@HEAD (r34008):

svn merge https://svn.collab.net/repos/svn/trunk

There were fo… Show more
On the issue-2843-dev branch: bring up-to-date with trunk@HEAD (r34008):

  svn merge https://svn.collab.net/repos/svn/trunk

There were four conflicts.  I am committing them with conflict markers

intact, so they can be resolved in a separate revision:

  subversion/libsvn_wc/update_editor.c

  subversion/libsvn_wc/lock.c

  subversion/libsvn_wc/adm_crawler.c

  subversion/libsvn_client/ra.c

Show less