So which is it?
Code: Select all
http://rom-bot.googlecode.com/svn/trunk/rom
Code: Select all
http://rom-bot.googlecode.com/svn/trunk
Code: Select all
http://rom-bot.googlecode.com/svn/trunk/rom
Code: Select all
http://rom-bot.googlecode.com/svn/trunk
oh, well if i right click the micromacro folder the path islisa wrote:well I mentioned it because every time you mentioned the address you never had the /rom at the end.
So which is it?orCode: Select all
http://rom-bot.googlecode.com/svn/trunk/rom
Code: Select all
http://rom-bot.googlecode.com/svn/trunk
Code: Select all
http://rom-bot.googlecode.com/svn/trunk
Code: Select all
https://micromacro.googlecode.com/svn/trunk/scripts
Code: Select all
http://rom-bot.googlecode.com/svn/trunk/rom
Code: Select all
http://rom-bot.googlecode.com/svn/trunk/rom/database
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.rock5 wrote:Did you or didn't you do a revert after doing an svn update?
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
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
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
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?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.
Users browsing this forum: Google [Bot] and 1 guest