Search Results for "file merge"

Fork of Mercurial SCM (https://mercurial.selenic.com/) with additions: - revision duplicates collision resolves - sparse fixes: -- purge cleanup all out-of-sparse (issue5626) -- merge only changes in sparse (issue6521) -- dirstat refresh on sparse conf changes -- `share` comand suport sparse -- ignore subrepos out of sparse - command `debugrevlog` enhances - #6745 feature : VFS failure on OS-impossible names now just drop file of conflict.

this fork of https://foss.heptapod.net/mercurial/tortoisehg/thg provides some my features: - graph transforms of repo-tree (feature/graphopt/merge-order) - repo-tree navigation keys (feature/repoview-nav-keys) - nav-repoview (feature/nav-repo) - ui: InteractiveUiHandler now can remember choices for prompted file on it's exact path, or recursive pathes

...Whisper allows for higher resolution (seconds per point) of recent data to degrade into lower resolutions for long-term retention of historical data. Copies data from src in dst, if missing. Unlike whisper-merge, don't overwrite data that's already present in the target file, but instead, only add the missing data (e.g. where the gaps in the target file are). Because no values are overwritten, no data or precision gets lost. Also, unlike whisper-merge, try to take the highest-precision archive to provide the data, instead of the one with the largest retention.

Tracking a Xcode project in a version control system is annoying. Simply adding files can lead to merge conflicts that have to be solved manually, although it would be possible to resolve the conflict automatically if the merge algorithm would be aware of the structure of Xcode's project file. After long and annoying merge sessions in one of my projects, I came to the conclusion, that writing a merge driver for git which understands the structure of the project file would be a worthwhile endeavour, as it would save me from solving the merge conflicts for my co-workers. ...

open source PLM system - Product Structure management (BOM management) system and Electronic documents management or Entreprise Content Management (ECM) system

gtkdocpo is a tool to create a pot file from C source files that used gtkdoc to generate API documents, and to merge the l10n po file to the C source files.

py-autopotools is a tool for i18n and l10n which automates a lot of the common tasks performed on po files. Create new files, delete or merge comments, file positions, and translations seperately, create default translations - pocreate does it all.