Henry Minsky | 1 Jun 23:09
Picon

anyone know what svn is trying to tell me here?

I get this error when trying to run svn-commit on a changeset


hqm <at> IBM-2E06404CB67 /cygdrive/c/users/hqm/openlaszlo/legals3
$ svn-commit
Sending        build-tools/findtests.js
Sending        build-tools/findtests.sh
Adding         build-tools/findtestsbrowser.sh
Sending        build.xml
Adding         test/lztest/browser.txt
Adding         test/lztest/lztest-lpp-2958.lzx
Adding         test/lztest/rhino.txt
Deleting       test/lztest/smoketest.txt
Transmitting file data ......svn: Commit failed (details follow):
svn: MERGE request failed on '/openlaszlo/branches/legals'
svn: MERGE of '/openlaszlo/branches/legals': 409 Conflict (http://svn.openlaszlo.org)

When I run svn status, it does not list any conflicts though ...
I did an svn up, and it does not complain either.


--
Henry Minsky
Software Architect
hminsky <at> laszlosystems.com


Gmane