diff options
| author | Evan Prodromou <evanprodromou@users.mediawiki.org> | 2004-12-02 19:57:34 +0000 |
|---|---|---|
| committer | Evan Prodromou <evanprodromou@users.mediawiki.org> | 2004-12-02 19:57:34 +0000 |
| commit | 2f4a80f6ef6a4a32c4c3e4bcfcd5408e15586699 (patch) | |
| tree | 3881f493cb9b121ca83ad47e3058f77d3776071d /docs | |
| parent | f696971eba84feadab524eb6e563cfa3d064b951 (diff) | |
| download | mediawikicore-2f4a80f6ef6a4a32c4c3e4bcfcd5408e15586699.tar.gz mediawikicore-2f4a80f6ef6a4a32c4c3e4bcfcd5408e15586699.zip | |
Further explanation as to why to avoid CVS keywords.
Notes
Notes:
http://mediawiki.org/wiki/Special:Code/MediaWiki/6472
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/design.doc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/design.doc b/docs/design.doc index af1ee3054abb..8adff443f08f 100644 --- a/docs/design.doc +++ b/docs/design.doc @@ -118,9 +118,11 @@ Naming/coding conventions: values wpName ("p" for "POST"). - Be kind to your release manager and don't use CVS keywords (Id, - Revision, etc.) to mark file versions; they make merging code between - different branches a pain for older versions (<1.12.x) of CVS, and - are kind of sketchy for versions after that. + Revision, etc.) to mark file versions. They make merging code + between different branches a pain for CVS, and are kind of sketchy + for versions after that. (Yes, you can use the '-kk' flag so that + merges ignore keywords, but that messes up binary files. See + https://www.cvshome.org/docs/manual/cvs-1.11.18/cvs_5.html#SEC64).
\ No newline at end of file |