The latest SVN bugs thread

[CuteAlien]

Thanks, those in CGUITreeView are new I think. I'll check them. (edit: fixed in [r6622])
The others should only show up when compiling in debug and are correct. Meaning - those things are not handled so far and those warnings remind us about that.

[juozas]

Svn reports a conflict for file tests/tests-last-passed-at.txt as it gets modified when running tests. Instead it should be added to ignore list or something because in current state it is very annoying as it would result in conflict each time during update if the tests were to be run before.

Code: Select all

Updating '.':
C    tests/tests-last-passed-at.txt
U    tests/textureFeatures.cpp
Updated to revision 6630.
Summary of conflicts:
  Text conflicts: 1
Merge conflict discovered in file 'tests/tests-last-passed-at.txt'.
Select: (p) Postpone, (df) Show diff, (e) Edit file, (m) Merge,
        (s) Show all options: df
--- tests/tests-last-passed-at.txt.r6630	- THEIRS
+++ tests/tests-last-passed-at.txt	- MERGED
@@ -1,4 +1,10 @@
 Tests finished. 72 tests of 72 passed.
 Compiled as DEBUG
+<<<<<<< .mine
+Test suite pass at GMT Sun May 12 05:08:35 2024
+||||||| .r6629
+Test suite pass at GMT Sat May 11 20:30:30 2024
+=======
 Test suite pass at GMT Sun May 12 13:12:37 2024
+>>>>>>> .r6630

[CuteAlien]

Hm, I get your problem. Then again it's nice to see if someone did run the tests or when they started failing (which is I guess why it's in there). Or didn't run tests despite changing half the engine...
Not sure if we can have both.

edit: Oh well, it's a bit useful, but I think merge conflicts are more annoying. Let's encourage more users running tests by ignoring this file. Done in [r6632]