[web2py:13283] Re: what does this mean

[Timothy Farrell]

It is called a version-control conflict.  It works when two files are edited by different sources in different ways.  Subversion tries to reconcile the differences, but in some cases it doesn't know which version is correct, so it munges the two files together in the form you saw.  This typically breaks a build or run process and brings the conflict to the attention of a dev who can fix it. savvy? Wes James wrote: I did an svn checkout of web2py. What does this mean: cat VERSION <<<<<<< .mine Version 1.52 (2008-12-03 11:25:27) ======= Version 1.53.5 (2008-12-08 16:55:03) .r543 Why are there two version items in the VERSION file? -wj -- Timothy Farrell <[EMAIL PROTECTED]> Computer Guy Statewide General Insurance Agency (www.swgen.com) --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "web2py Web Framework" group. To post to this group, send email to web2py@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/web2py?hl=en -~----------~----~----~----~------~----~------~--~---