On Mar, 3 de Mayo de 2005, 15:53, Vadim Gritsenko dijo:
Antonio Gallardo wrote:
On Mar, 3 de Mayo de 2005, 14:36, Vadim Gritsenko dijo:
Antonio Gallardo wrote:
I want revert changes in src/java/org/apache/cocoon/util/NetUtils.java from HEAD to 53864. How to do this?
svn merge -r HEAD:53864 src/java/org/apache/cocoon/util/NetUtils.java src/java/org/apache/cocoon/util/NetUtils.java
This is what I tried and don't work here. Dunno why.
What happens?
svn merge -r HEAD:165501 https://svn.apache.org/repos/asf/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/NetUtils.java svn: requerimiento REPORT fall� en '/repos/asf/!svn/vcc/default' svn: Cannot replace a directory from within
Make sure you type command as written above:
svn merge -r HEAD:53864 src/java/org/apache/cocoon/util/NetUtils.java src/java/org/apache/cocoon/util/NetUtils.java
Note that file name is repeated twice. Probably you wrote only once and it tried to patch ".", and failed.
Vadim
