As a lazy man, I've chosen to do "svn up --accept theirs-full" and always get the svn version. I've never made any chages in any part of the code, so I really don't care to keep anything from my local copy
2010/10/3 Carsten Haitzler <[email protected]> > On Sun, 3 Oct 2010 12:08:18 -0300 Leandro Santiago < > [email protected]> > said: > > > Hello to all. > > > > Every time I update the efl svn tree, conflicts happen in the > > translation files. I don't change these files here, but they are > > always broken. > > > > Conflict discovered in 'e/po/zh_CN.po'. > > Selecione (p) postpone, (df) diff-full, (e) edit, > > (mc) mine-conflict, (tc) theirs-conflict, > > (s) show all options: > > > > Why do they happen? > > a necessary evil that merges in new strings to be translated (and the > gettext > tools, as a result also update all existing strings with the correct source > file and line #). if we dont do this then .po files get behind and dont get > updated strings to translate and things get missed. > > > -- > ------------- Codito, ergo sum - "I code, therefore I am" -------------- > The Rasterman (Carsten Haitzler) [email protected] > > > > ------------------------------------------------------------------------------ > Virtualization is moving to the mainstream and overtaking non-virtualized > environment for deploying applications. Does it make network security > easier or more difficult to achieve? Read this whitepaper to separate the > two and get a better understanding. > http://p.sf.net/sfu/hp-phase2-d2d > _______________________________________________ > enlightenment-users mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-users > -- Wido ------------------------------------------------------------------------------ Virtualization is moving to the mainstream and overtaking non-virtualized environment for deploying applications. Does it make network security easier or more difficult to achieve? Read this whitepaper to separate the two and get a better understanding. http://p.sf.net/sfu/hp-phase2-d2d _______________________________________________ enlightenment-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-users
