>> WHO COMMITS SUCH A CRAP??? >> Don't you test your code before committing? > > That is a subversion conflict. Your local copy of dMenuItem was > modified in a way that svn couldn't resolve. > > The code in the repository doesn't contain that (see > http://trac.dabodev.com/browser/trunk/dabo/ui/uiwx/dMenuItem.py) > . > > The markings are designed to show where your change conflicted with > the version in the repository. You can look at that code, and decide > if you want to keep your version, discard your changes, or manually > integrate them.
Sorry, I should have researched a bit, never experienced such a conflict and didn't remember that I changed the file myself. "svn update" runs in a cronjob, so I didn't see any messages. Greetlings, Hraban _______________________________________________ Post Messages to: [email protected] Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev Searchable Archives: http://leafe.com/archives/search/dabo-dev This message: http://leafe.com/archives/byMID/[EMAIL PROTECTED]
