view .hgignore @ 8316:46e78e583ed3

scripts/i18n: add command 'normalized-merge' for use with Mercurial's 'merge-tool' option Add a 'normalized-merge' command to scripts/i18n that will first normalize the i18n files contributing to the merge, then perform a standard merge. If that merge fails (e.g. due to real conflicts) the normalized files are left behind, and the user needs to run another merge tool manually and resolve the merge of these. Use by putting following snippets in your .hgrc file: [merge-tools] i18n.executable = /path/to/scripts/i18n i18n.args = normalized-merge $local $base $other $output or [merge-tools] i18n.executable = python3 i18n.args = /path/to/scripts/i18n normalized-merge $local $base $other $output and when i18n files conflict, get all 3 sides of the merge normalized before merge by running: hg resolve 'kallithea/i18n/*/LC_MESSAGES/kallithea.po' --tool i18n
author Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
date Thu, 19 Dec 2019 00:28:45 +0100
parents 17b86a2976ca
children 43d9615facc6
line wrap: on
line source

syntax: glob
*.pyc
*.swp
*.sqlite
*.tox
*.egg-info
*.egg
*.mo
*.orig
*.rej
*.bak
.eggs/
tarballcache/

syntax: regexp
^rcextensions
^build
^dist/
^docs/build/
^docs/_build/
^data$
^sql_dumps/
^\.settings$
^\.project$
^\.pydevproject$
^\.coverage$
^kallithea/front-end/node_modules$
^kallithea/front-end/package-lock\.json$
^kallithea/front-end/theme\.less$
^kallithea/front-end/tmp$
^kallithea/public/codemirror$
^kallithea/public/css/select2-spinner\.gif$
^kallithea/public/css/select2\.png$
^kallithea/public/css/select2x2\.png$
^kallithea/public/css/style\.css$
^kallithea/public/css/style\.css\.map$
^kallithea/public/js/bootstrap\.js$
^kallithea/public/js/dataTables\.bootstrap\.js$
^kallithea/public/js/jquery\.atwho\.min\.js$
^kallithea/public/js/jquery\.caret\.min\.js$
^kallithea/public/js/jquery\.dataTables\.js$
^kallithea/public/js/jquery\.flot\.js$
^kallithea/public/js/jquery\.flot\.selection\.js$
^kallithea/public/js/jquery\.flot\.time\.js$
^kallithea/public/js/jquery\.min\.js$
^kallithea/public/js/select2\.js$
^kallithea\.db$
^test\.db$
^Kallithea\.egg-info$
^my\.ini$
^fabfile.py
^\.idea$
^\.cache$
^\.pytest_cache$
/__pycache__$