Back to the main page.
Bug 68 - double presence in svn, both file and external
| Status | CLOSED WORKSFORME |
| Reported | 2010-04-16 16:56:00 +0200 |
| Modified | 2011-01-26 15:38:40 +0100 |
| Product: | FieldTrip |
| Component: | core |
| Version: | unspecified |
| Hardware: | PC |
| Operating System: | Mac OS |
| Importance: | P5 normal |
| Assigned to: | Joint development user |
| URL: | |
| Tags: | |
| Depends on: | |
| Blocks: | |
| See also: |
Robert Oostenveld - 2010-04-16 16:56:49 +0200
Guillaume wrote on 16 April 2010: I observe conflicts when checking out the 'private' folder for lmoutr.mex*, plgndr.mex*, ptriproj.*, solid_angle.mex*. My understanding is that these files are checked out first as normal files and then checked out again as being file externals. You see this conflict occurring only when doing a fresh checkout, not a subsequent update.
Stefan Klanke - 2010-04-28 16:03:46 +0200
s.klanke: I tried a fresh checkout on both Windows (TortoiseSVN 1.6.7/Subversion 1.6.9) and Linux (svn --version => 1.6.9) and I don't get these conflicts. @Guillaume: Which SVN client do you use?
Robert Oostenveld - 2011-01-26 15:37:20 +0100
I closed all bugs that were resolved prior and including 2011-01-25. All resolved bugs should have been discussed by now, therefore we don't want to see them again in the next meeting. Instead, in the next meeting we want to see the recent improvements and fixes.