| commit | 4e9179e7c201f1bc2dc5a561e38e57f2f91d3889 | |
| author | glasser <glasser@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a> | |
| Tue, 11 Dec 2007 19:36:37 +0000 (11 19:36 +0000) | ||
| committer | glasser <glasser@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a> | |
| Tue, 11 Dec 2007 19:36:37 +0000 (11 19:36 +0000) | ||
| tree | 6a4e7d06bff2724fd27644edfae0259a1811e624 | treesnapshot (tar.gz zip) |
| parent | fba4fd64dd8b32855a7fc8f0349bcc63630e1262 | commitdiff |
In the command-line client, forbid
$ svn merge -r12:45 URL1 URL2
* subversion/svn/merge-cmd.c
(svn_cl__merge): When parsing args with "rev range syntax", make sure not
to set "targetpath" to an URL.
git-svn-id: http://svn.collab.net/repos/svn/trunk@28404 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
$ svn merge -r12:45 URL1 URL2
* subversion/svn/merge-cmd.c
(svn_cl__merge): When parsing args with "rev range syntax", make sure not
to set "targetpath" to an URL.
git-svn-id: http://svn.collab.net/repos/svn/trunk@28404 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
| subversion/svn/merge-cmd.c | diffblobblamehistory |