Updating repositories

To update your local repositories:

$ svn up $FLAIR_ROOT/flair-dev --accept theirs-full
$ svn up $FLAIR_ROOT/flair-bin --accept theirs-full
$ svn up $FLAIR_ROOT/flair-src

If you are an hds user: To update your local repositories:

$ svn up $FLAIR_ROOT/flair-hds --accept theirs-full

In some cases, you can have a conflict between local file and remote files. This can happen if you recompiled all for example. In this case, and if you are sure you can discard your changes, answer tf to the conflict question.

And for HDS users:

$ svn up $FLAIR_ROOT/flair-hds --accept theirs-full