Author Topic: unified workspace and cbp under Windows for different wxWidgets versions  (Read 14971 times)

Offline Miguel Gimenez

  • Developer
  • Lives here!
  • *****
  • Posts: 1827
In the first code tag the path is incorrect, FortranProject is not in trunk but in trunk/src/plugins/contrib

Offline Pecan

  • Plugin developer
  • Lives here!
  • ****
  • Posts: 2923
I completely delete trunk.
I do a clean chieckout
F:\usr\Programs\TortoiseSVN\bin\svn.exe checkout https://svn.code.sf.net/p/codeblocks/code/trunk
I get the error:
Code
Fetching external item into 'trunk\src\plugins\contrib\FortranProject':
svn: warning: W155035: The external 'https://svn.code.sf.net/p/fortranproject/code/trunk' defined in svn:externals at 'F:\usr\Proj\cbDevel328WrkCC\trunk\trunk\src\plugins\contrib' cannot be checked out because 'F:\usr\Proj\cbDevel328WrkCC\trunk\trunk\src\plugins\contrib\FortranProject' is already a versioned path.

Checked out revision 13804.
svn: E205011: Failure occurred processing one or more externals definitions


I cd to the contrib directory and delete fortran project. It seem to do it.

Code
cd .\trunk\src\plugins\contrib\
F:\usr\Proj\cbDevel328WrkCC\trunk\src\plugins\contrib> F:\usr\Programs\TortoiseSVN\bin\svn.exe delete .\FortranProject\
D         FortranProject
D         FortranProject\FortranProject_cbsvn_Windows.cbp

I cd back to trunk and do an update.
I still get the update error.

Code
 F:\usr\Programs\TortoiseSVN\bin\svn.exe update
Updating '.':

Fetching external item into 'src\plugins\contrib\FortranProject':
svn: warning: W155035: The external 'https://svn.code.sf.net/p/fortranproject/code/trunk' defined in svn:externals at 'F:\usr\Proj\cbDevel328WrkCC\trunk\src\plugins\contrib' cannot be checked out because 'F:\usr\Proj\cbDevel328WrkCC\trunk\src\plugins\contrib\FortranProject' is already a versioned path.

At revision 13804.
svn: E205011: Failure occurred processing one or more externals definitions
F:\usr\Proj\cbDevel328WrkCC\trunk>

Offline Miguel Gimenez

  • Developer
  • Lives here!
  • *****
  • Posts: 1827
You forgot the second part of my message:
Code
svn commit

Offline Pecan

  • Plugin developer
  • Lives here!
  • ****
  • Posts: 2923
You forgot the second part of my message:
Code
svn commit

Doesn't that mean I'm committing to the main repo. I thought whoever did the change in the first place would have committed a fix.

Does everyone checking out the main repo have to do this.
There must be something I'm not understanding.

Offline Miguel Gimenez

  • Developer
  • Lives here!
  • *****
  • Posts: 1827
Yes, you are modifying the main repo. Ollydbg or you can do this, I cannot because I do not have access currently to my computer.

Offline Pecan

  • Plugin developer
  • Lives here!
  • ****
  • Posts: 2923
Yes, you are modifying the main repo. Ollydbg or you can do this, I cannot because I do not have access currently to my computer.

Ok, I'll do another clean checkout, and follow your directions.
I just didn't want to modify something I didn't understand.
Thanks.

Offline Pecan

  • Plugin developer
  • Lives here!
  • ****
  • Posts: 2923
Yes, you are modifying the main repo. Ollydbg or you can do this, I cannot because I do not have access currently to my computer.

Code
Deleting       FortranProject
Committing transaction...
Committed revision 13805

I also got a clean update from externals.

Thanks for your patients.

Offline ollydbg

  • Developer
  • Lives here!
  • *****
  • Posts: 6176
  • OpenCV and Robotics
    • Chinese OpenCV forum moderator
Good work guys.

BTW. I nener known that we(or some cb dev) can access the Fortran plugin snv repo.
If some piece of memory should be reused, turn them to variables (or const variables).
If some piece of operations should be reused, turn them to functions.
If they happened together, then turn them to classes.