Michele Cella wrote:
> Kevin Dangoor wrote:
> > I got a couple conflicts trying to merge from 1.0 to trunk and it
> > looks like test_errorhandling at least has some bad line endings that
> > my editor graciously corrected, but now I need to merge. (And it's
> > harder for me to know if I just take everything since work has begun
> > on the trunk).
> >
> > So, just a reminder to keep your editors set for spaces and unix-style
> > line endings.
> >
>
> Yep I also noticed this sometimes ago but forgot to mention it, by the
> way here we get an useful output I think:
>
> [EMAIL PROTECTED]:~/Progetti/TurboGears/svn/1.0/turbogears$ svn revert -R *
> Skipped 'catwalk-session'
> [EMAIL PROTECTED]:~/Progetti/TurboGears/svn/1.0/turbogears$ find . -name
> "*.py" -exec dos2unix '{}' \;
> [EMAIL PROTECTED]:~/Progetti/TurboGears/svn/1.0/turbogears$ svn revert -R *
> Skipped 'catwalk-session'
> Reverted 'decorator.py'
> Reverted 'genericfunctions.py'
> Reverted 'i18n/format.py'
> Reverted 'i18n/utils.py'
> Reverted 'tests/catwalk_models/model_list.py'
> Reverted 'tests/catwalk_models/model_structure.py'
> Reverted 'tests/catwalk_models/single_join.py'
> Reverted 'tests/catwalk_models/browse.py'
> Reverted 'tests/test_catwalk.py'
> Reverted 'toolbox/catwalk/browse.py'
> Reverted 'widgets/tests/test_datagrid.py'
> [EMAIL PROTECTED]:~/Progetti/TurboGears/svn/1.0/turbogears$
>
> it seems those files have been all corrected.
>
> Should I try with *.*?
>
Another (fine tuned) attempt:
[EMAIL PROTECTED]:~/Progetti/TurboGears/svn/1.0/turbogears$ svn revert -R *
| grep Reverted
[EMAIL PROTECTED]:~/Progetti/TurboGears/svn/1.0/turbogears$ find . \( -name
"*.py" -o -name "*.kid" -o -name "*.js" -o -name "*.css" \) -exec
dos2unix '{}' \;
[EMAIL PROTECTED]:~/Progetti/TurboGears/svn/1.0/turbogears$ svn revert -R *
| grep Reverted
Reverted 'decorator.py'
Reverted 'genericfunctions.py'
Reverted 'i18n/format.py'
Reverted 'i18n/utils.py'
Reverted 'static/css/widget.css'
Reverted 'static/js/widget.js'
Reverted 'tests/catwalk_models/model_list.py'
Reverted 'tests/catwalk_models/model_structure.py'
Reverted 'tests/catwalk_models/single_join.py'
Reverted 'tests/catwalk_models/browse.py'
Reverted 'tests/test_catwalk.py'
Reverted 'toolbox/designer/static/diagram/styles/style.js'
Reverted 'toolbox/designer/static/diagram/js/main.js'
Reverted 'toolbox/designer/static/diagram/js/io.js'
Reverted 'toolbox/designer/static/diagram/js/objects.js'
Reverted 'toolbox/designer/static/diagram/js/animator.js'
Reverted 'toolbox/designer/static/diagram/js/generic.js'
Reverted 'toolbox/designer/static/diagram/js/settings.js'
Reverted 'toolbox/designer/static/diagram/js/ajax.js'
Reverted 'toolbox/designer/static/diagram/js/sql_types.js'
Reverted 'toolbox/designer/static/sh/shBrushDelphi.js'
Reverted 'toolbox/designer/static/sh/shBrushPhp.js'
Reverted 'toolbox/designer/static/sh/shBrushVb.js'
Reverted 'toolbox/designer/static/sh/shBrushJScript.js'
Reverted 'toolbox/designer/static/sh/shBrushSql.js'
Reverted 'toolbox/designer/static/sh/shBrushCSharp.js'
Reverted 'toolbox/designer/static/sh/shBrushXml.js'
Reverted 'toolbox/designer/static/sh/shBrushPython.js'
Reverted 'toolbox/designer/static/sh/SyntaxHighlighter.css'
Reverted 'toolbox/designer/static/sh/shCore.js'
Reverted 'toolbox/info.kid'
Reverted 'toolbox/catwalk/columns.kid'
Reverted 'toolbox/catwalk/static/javascript/browse.js'
Reverted 'toolbox/catwalk/browse.py'
Reverted 'toolbox/catwalk/browse_grid.kid'
Reverted 'widgets/tests/test_datagrid.py'
Reverted 'widgets/static/calendar/lang/cn_utf8.js'
Reverted 'widgets/static/calendar/lang/calendar-si.js'
Reverted 'widgets/static/calendar/lang/calendar-hr-utf8.js'
Reverted 'widgets/static/calendar/lang/calendar-el.js'
Reverted 'widgets/static/calendar/lang/calendar-hr-utf-8.js'
Reverted 'widgets/static/calendar/lang/calendar-tr.js'
Reverted 'widgets/static/calendar/lang/calendar-bg.js'
Reverted 'widgets/static/grid.css'
Reverted 'widgets/templates/datagrid.kid'
[EMAIL PROTECTED]:~/Progetti/TurboGears/svn/1.0/turbogears$
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"TurboGears Trunk" 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/turbogears-trunk
-~----------~----~----~----~------~----~------~--~---
