SolarStrike Software

Posted: **Sun Feb 06, 2011 4:02 am**

well I mentioned it because every time you mentioned the address you never had the /rom at the end.
So which is it?

http://rom-bot.googlecode.com/svn/trunk/rom

or

Code: Select all

http://rom-bot.googlecode.com/svn/trunk

Posted: **Sun Feb 06, 2011 5:32 am**

I think the version you downloaded wouldn't have had svn info so the svn info in the rom folder is from your replaced version.

Maybe there is some setting in tortoise that is screwing it up. I don't know what it could be though. Is your Tortoise SVN very old? Maybe it might be worth updating it.

Posted: **Sun Feb 06, 2011 6:24 pm**

lisa wrote:well I mentioned it because every time you mentioned the address you never had the /rom at the end.
So which is it?
Code: Select all
http://rom-bot.googlecode.com/svn/trunk/rom
or
Code: Select all
http://rom-bot.googlecode.com/svn/trunk

oh, well if i right click the micromacro folder the path is

Code: Select all

http://rom-bot.googlecode.com/svn/trunk

if i right click my micromacro/scripts folder

Code: Select all

https://micromacro.googlecode.com/svn/trunk/scripts

" " " " " micromacro/scripts/rom folder

Code: Select all

http://rom-bot.googlecode.com/svn/trunk/rom

" " " " " micromacro/scripts/rom/database folder

Code: Select all

http://rom-bot.googlecode.com/svn/trunk/rom/database

i checked all of them with issues, they are all following the correct folder paths i think.

i think i need a newer version of TortioseSVN?, i got SVN from the same place i got RomBot.

where is the best version of that located?

p.s.
after overwriting the old rombot files with the new ones from the google trunk, basically the whole rom folder is conflicting according to SVN. if i use SVN to update them (despite i already have the files from where they would be getting updated... and even with the correct relocate path) the bot has an extra "<" character among other confilcts when i try to run it.
probably need a new Tortiose?

i mean the bot is working perfectly fine... SVN is just saying things aren't good.

Posted: **Sun Feb 06, 2011 8:04 pm**

Did you or didn't you do a revert after doing an svn update?

Posted: **Mon Feb 07, 2011 4:13 pm**

***in the process of making this post out of frustration i actually got all green check marks, but i decided to post it anyway because i actually spent some time illustrating my steps, and maybe people who find this post with similar issues might find it helpful***

P.S.
Thank You for the replies and helping me, much apprecieted

rock5 wrote:Did you or didn't you do a revert after doing an svn update?

everytime i try to SVN update/revert or a vast combination of mixing the two i cannot manage to get rid of the exclamations on my files/folders.
i have a backed-up micromacro folder that i keep having to use to replace the one i try to resolve with SVN.

i uninstalled my current version>restarted my machine>ran CCleaner
then i downloaded & installed the 32-bit version from here:
http://tortoisesvn.net/downloads.html
and restarted my machine

i still was running into the same problems as before.
i ran the installer again and ran a "repair" and restarted me machine.

still same unresolved folders.

when i right click>SVN update:

"Command Update
Completed At revision: 17

4 kBytes transferred in 0 minute(s) and 1 second(s)"

if i click "show log..."

revision line 17>right click>coppied to clipboard

Code: Select all

Revision 17
Author: mystikfox
Date: 11:07:10 AM, Tuesday, January 11, 2011
Message:
Added: Sound support using OpenAL
Added: table.print(), table.contains(), table.save(), and table.load()
Added: string.randomhash()
----
Added : /trunk/alut.dll
Modified : /trunk/changelog.txt
Modified : /trunk/lib/lib.lua
Modified : /trunk/lib/mods/keyboard/en_uk.lua
Modified : /trunk/lib/mods/keyboard/en_us.lua
Modified : /trunk/lib/mods/string_addon.lua
Modified : /trunk/lib/mods/table_addon.lua
Added : /trunk/src/audiodevice.cpp
Added : /trunk/src/audiodevice.h
Added : /trunk/src/audioresource.cpp
Added : /trunk/src/audioresource.h
Modified : /trunk/src/luaglue.cpp
Modified : /trunk/src/luaglue.h
Modified : /trunk/src/macro.cpp
Modified : /trunk/src/macro.h

everything in my rom folder still is loaded with red

i then SVN update the next sub folder: "scripts"
"completed at revision 17"

Code: Select all

Revision: 8
Author: mystikfox
Date: 5:27:58 PM, Thursday, May 13, 2010
Message:
Fix: Ensure that setting window's initial size doesn't use negative numbers
Fix: Some minor error checking in function setPriority()
----
Added : /trunk/changelog.txt
Added : /trunk/commands
Added : /trunk/commands/exec.lua
Added : /trunk/commands/keytest.lua
Added : /trunk/config.lua
Added : /trunk/data
Added : /trunk/data/dummy.txt
Added : /trunk/lib/mods/table_addon.lua
Added : /trunk/libexpat.dll
Added : /trunk/license.txt
Added : /trunk/lua5.1.dll
Added : /trunk/lua51.dll
Added : /trunk/micromacro.exe.manifest
Added : /trunk/micromacro_help.txt
Added : /trunk/plugins
Added : /trunk/plugins/dummy.txt
Added : /trunk/scripts
Added : /trunk/scripts/dummy.txt
Added : /trunk/src/README.txt
Modified : /trunk/src/luaengine.cpp
Modified : /trunk/src/macro.cpp

"rom" folder is still loaded with red

SVN update rom folder:
http://i53.tinypic.com/w1sco2.png

log:

Code: Select all

Revision: 8
Author: mystikfox
Date: 5:27:58 PM, Thursday, May 13, 2010
Message:
Fix: Ensure that setting window's initial size doesn't use negative numbers
Fix: Some minor error checking in function setPriority()
----
Added : /trunk/changelog.txt
Added : /trunk/commands
Added : /trunk/commands/exec.lua
Added : /trunk/commands/keytest.lua
Added : /trunk/config.lua
Added : /trunk/data
Added : /trunk/data/dummy.txt
Added : /trunk/lib/mods/table_addon.lua
Added : /trunk/libexpat.dll
Added : /trunk/license.txt
Added : /trunk/lua5.1.dll
Added : /trunk/lua51.dll
Added : /trunk/micromacro.exe.manifest
Added : /trunk/micromacro_help.txt
Added : /trunk/plugins
Added : /trunk/plugins/dummy.txt
Added : /trunk/scripts
Added : /trunk/scripts/dummy.txt
Added : /trunk/src/README.txt
Modified : /trunk/src/luaengine.cpp
Modified : /trunk/src/macro.cpp

at this point the biggest change has occured. there are less exclamations, but now some are red, and now some are yellow.

all of the confilcts were in the rom folder. it now looks like this:
http://i51.tinypic.com/sgj32c.png

after SVN update on every conflict, the folder now looks like this:
http://i53.tinypic.com/2ykhp4i.png

after opening the classes folder, "eggpet.lua" has a red exclamation. SVN update did not resolve this.

after opening languages folder, "english.lua" has a yellow exclamation. SVN update did not resolve this.

after openeing profiles folder, "Default.xml" has a yellow exclamation. SVN update did not resolve this.

Before i go any further i will check if the bot still works after all of this updating, it works no problem before i do any of this, starting with the google trunk files (many conflicts according to SVN)
http://i54.tinypic.com/6p1934.png

the "bot.lua" line(s) in question:
http://i52.tinypic.com/8z4uuq.png

from here im at a loss... so i try the "Revert" option in SVN.
i will start at the main folder and continue through tot he sub folders? idk... thats how i started might as well do it that way... or does it matter if i do it exactly in reverse?

micromacro folder>Revert : files list is empty
scripts folder>Revert : files list is empty
rom folder>Revert : http://i53.tinypic.com/sw5w1h.png
from here i suppose the best thing to do is revert the "conflicted" files...or Revert all(i can try the rest later i suppose...)?

the 6 i selected to revert (conflicted, in red) finished.
there is now a red "!" on only the following:

C:\Documents and Settings\Nick\Desktop\micromacro\scripts\rom\addresses.lua
C:\Documents and Settings\Nick\Desktop\micromacro\scripts\rom\classes\eggpet.lua

...and ofc their respective containing folders.

does the bot work?
http://i56.tinypic.com/aw3v6d.png

yea, but TortoiseSVN still is showing conflicts, just not as many:
http://i53.tinypic.com/357fxhf.png

so what now?

addresses.lua>Revert : green checkmark
eggpet.lua>Revert : green checkmark

***this is about where i was going to delete this, and decided to post it anyway for anyone who found this looking for similar help***

Thanks again for speedy replies & help, much appreciated

rock5 wrote:Didn't we say right click the 'rom' folder to do the 'svn update' and 'revert'?

What you need to understand is micromacro and the rombot are 2 different things. When you updated the micromacro folder, you were updating micromacro. Only when you updated the 'rom' folder were you updating the bot.

Also 'conflicting' files have yellow icon next to them and usually are accompanied by different versions of the same file. 'conflict' means where the 'svn update' wanted to change the file, there was already a change there so it didn't know how to merge them.

On the other hand, red icons just mean the file has been edited. Usually it means the update was successful because the changes in the file didn't get in the way of the changes 'svn update' wanted to make so there were no conflicts. But if you didn't edit them yourself and don't know why they're red, it's still best to revert them.

I hope that clears some thing up for you.

ty, yes it does. after replacing my old files from the google trunk and finding that the rom folder was so many colors but green it seemed sketchy. i do now realize why most of them were red and my rombot still worked. and partially why there were so many conflicting yellow files... because the update was trying to put files there that i had already put from the google trunk... so i guess that makes sense now. i'm still not 100% sure what "Revert" does... if it makes the files green only because they were "reverted" back to a previous state... isn't that something that is kind of counter-productive?

Posted: **Mon Feb 07, 2011 9:08 pm**

Didn't we say right click the 'rom' folder to do the 'svn update' and 'revert'?

What you need to understand is micromacro and the rombot are 2 different things. When you updated the micromacro folder, you were updating micromacro. Only when you updated the 'rom' folder were you updating the bot.

Also 'conflicting' files have yellow icon next to them and usually are accompanied by different versions of the same file. 'conflict' means where the 'svn update' wanted to change the file, there was already a change there so it didn't know how to merge them.

On the other hand, red icons just mean the file has been edited. Usually it means the update was successful because the changes in the file didn't get in the way of the changes 'svn update' wanted to make so there were no conflicts. But if you didn't edit them yourself and don't know why they're red, it's still best to revert them.

I hope that clears some thing up for you.

SolarStrike Software

help changing new target delay time

Re: help changing new target delay time

Re: help changing new target delay time

Re: help changing new target delay time

Re: help changing new target delay time

Re: help changing new target delay time

Re: help changing new target delay time