[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

svn bug

From: Tomas Javurek <tomas.javurek_at_physik.uni-freiburg.de>
Date: Tue, 25 Mar 2014 16:52:38 +0100

Hi svn developers,

once I tried to commit txt file with these two lines:

RUNNING:
=======

written inside, I got following error message:

[tjavurek_at_lxplus0057]~/pMSSM/BooFactory/Tools2% svn ci -m
"" error.txt
Sending error.txt
Transmitting file data .svn: Commit failed (details
follow):
svn: Commit blocked by pre-commit hook (exit code 1) with
output:
Some parts of your commit look suspiciously like merge
conflict markers. Please double-check your diff and try
committing again.

Best, Tomas.
Received on 2014-03-25 17:12:45 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.