subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Subversion Wiki] Update of "MergeBugsAndErrorReporting" by JulianFoad
Date Fri, 28 Oct 2011 11:56:23 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.

The "MergeBugsAndErrorReporting" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/MergeBugsAndErrorReporting?action=diff&rev1=3&rev2=4

  Simple bugs, and enhancements to error reporting.
  
-  * This error needs a higher-level message:
+  * These errors needs a higher-level message:
  
  {{{
  $ svn merge -r1181882:1177606 ^/trunk
- /home/.../subversion/svn/util.c:913: (apr_err=160013)
+ /.../subversion/svn/util.c:913: (apr_err=160013)
- /home/.../subversion/libsvn_client/merge.c:11057: (apr_err=160013)
+ /.../subversion/libsvn_client/merge.c:11057: (apr_err=160013)
- /home/.../subversion/libsvn_client/merge.c:11011: (apr_err=160013)
+ /.../subversion/libsvn_client/merge.c:11011: (apr_err=160013)
- /home/.../subversion/libsvn_client/merge.c:11011: (apr_err=160013)
+ /.../subversion/libsvn_client/merge.c:11011: (apr_err=160013)
- /home/.../subversion/libsvn_client/merge.c:10959: (apr_err=160013)
+ /.../subversion/libsvn_client/merge.c:10959: (apr_err=160013)
- /home/.../subversion/libsvn_client/merge.c:6532: (apr_err=160013)
+ /.../subversion/libsvn_client/merge.c:6532: (apr_err=160013)
- /home/.../subversion/libsvn_client/ra.c:611: (apr_err=160013)
+ /.../subversion/libsvn_client/ra.c:611: (apr_err=160013)
- /home/.../subversion/libsvn_ra_serf/getlocationsegments.c:247: (apr_err=160013)
+ /.../subversion/libsvn_ra_serf/getlocationsegments.c:247: (apr_err=160013)
- /home/.../subversion/libsvn_ra_serf/util.c:2462: (apr_err=160013)
+ /.../subversion/libsvn_ra_serf/util.c:2462: (apr_err=160013)
  svn: E160013: '/repos/asf/!svn/bc/1182329/trunk' path not found
+ 
+ $ svn merge --dry-run ../subversion-g/@1100000
+ /.../subversion/svn/util.c:913: (apr_err=160013)
+ /.../subversion/libsvn_client/merge.c:11038: (apr_err=160013)
+ /.../subversion/libsvn_client/merge.c:10990: (apr_err=160013)
+ /.../subversion/libsvn_client/merge.c:10938: (apr_err=160013)
+ /.../subversion/libsvn_client/merge.c:6521: (apr_err=160013)
+ /.../subversion/libsvn_client/ra.c:580: (apr_err=160013)
+ /.../subversion/libsvn_ra_serf/getlocationsegments.c:247: (apr_err=160013)
+ /.../subversion/libsvn_ra_serf/util.c:2455: (apr_err=160013)
+ svn: E160013: '/repos/asf/!svn/rvr/1100000/subversion/branches/showing-merge-info' path
not found
  }}}
  
   * The message about recording mergeinfo at the end of a catch-up merge seems to report
the wrong starting revision:

Mime
View raw message