Hi, This propset is what producing conflicts while merging: the line containing this propset is always changed between two revisions of the same file. You'll get conflicts you've worked on the same file, and revolving them will be a waste of time (not a real conflict between two codes, but between svn internals...)
Cheers, Seb > Greetings, > > Just to clarify, are you guys talking about using SVN's propset > command, etc. features? > > http://svnbook.red-bean.com/en/1.1/ch07s02.html > > Seems like it would do what you want, and it is turned off by default. > Something like " -- $Rev$ " might work. > > William > > On Oct 10, 6:26 pm, William <[email protected]> wrote: > > If it were only 16 instructions, and/or if it were disabled by > > default, I have no problem with it. > > > > But actually 16 instructions seems a very very low estimate, unless > > you also keep some sort of map or symbol table that helps you > > understand which libraries the 16 instructions relate to. I was > > assuming something a very verbose, flattened ascii path name/library > > name, plus a SVN revision string, per library. > > > > William > > > > On Oct 10, 3:49 pm, Joep Suijs <[email protected]> wrote: > > > > > > > > > Hi Seb, > > > > > > I'm quite surprised by replies here, where few bytes would be used to > put > > > > > a version number in a way or another. I can> remember discussions about > optimizing code space, the most we can... 0.5% > > > > > of code space for this seems huge, don't you think ? > > > > > 0.5% of 16kbyte flash are 16 instructions, which is less space then > > > required to add a constant to a dword. So not huge IMO, as long as it > is > > > usefull. > > > > > > Yep, not a good idea IMHO... > > > > > Then it takes too much space ;) > > > Joep > > > -- Sébastien Lelong http://www.sirloon.net http://sirbot.org --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "jallib" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/jallib?hl=en -~----------~----~----~----~------~----~------~--~---
