I copied the contents of C:\SlowControls on h1brsex and h1brsey onto a usb stick. I committed changes local to h1brsex into svn. I ran svn update on h1brsey. I was just expecting the changes I committed from h1brsex to show up, but a whole lot more did. I guess no one had run svn update in a long time. It appeared to complete without conflicts and reported that it was now at revision 6189. I started committing files to svn on h1brsey that I thought did not conflict between the two machines, but I think I accidentally committed one that does. I committed local changes on h1brsey to /trunk/BRS2 C#/BRSReadout/configs/LHOEY.config, but afterward found that there are also local changes to the same file on h1brsex.