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, 09 Dec 2011 11:04:50 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=8&rev2=9

  --- Merging r836421 through r1195874 into '.':
  }}}
  
+  * Bad parsing of a local path argument '.' with a peg revision specifier. (Not specific
to merge, presumably.)
+ 
+  {{{
+ $ svn merge .@COMMITTED .@PREV .
+ svn: E125001: '@COMMITTED' is just a peg revision. Maybe try '@COMMITTED@' instead?
+ }}}
+ 
+  * A merge source specified as a local path with a peg revision is not handled, and the
error message is unhelpful.
+ 
+  {{{
+ $ svn merge subversion@COMMITTED subversion@PREV subversion
+ svn: E195000: A path under version control is needed for this operation
+ }}}
+ 

Mime
View raw message