Change 30554

tom_tyler (C. Thomas Tyler)
C. Thomas Tyler committed this change into //automerge/main under Review 31390
View Review
Download .zip
A few refresher changes:
* Updated copyrights for this project (2011 to 2024).
* Fixed various doc typos and broken email links.
* Tweaked comments in code to refer to modern SDP location
for password files and to use /p4/common/site/automerge as
the home directory, following the modern SDP covention
using the 'site' directory.
* Fixed a broken link to the long-gone blog article "Living
on the Edge - Automatic Merging" by adding the article in
the new 'docs' folder (adding the original Word doc and
converting to HTML).

No functional changes.
  • Files 12
  • Comments 0
4 edited 8 added 0 deleted
LICENSE#2
Loading...
README.md#2
Loading...
automerge.py#2
Loading...
docs/LivingOnTheEdge-AutomaticMerging.docx#1
Loading...
docs/LivingOnTheEdge-AutomaticMerging.fld/colorschememapping.xml#1
Loading...
docs/LivingOnTheEdge-AutomaticMerging.fld/filelist.xml#1
Loading...
docs/LivingOnTheEdge-AutomaticMerging.fld/image001.png#1
Loading...
docs/LivingOnTheEdge-AutomaticMerging.fld/image002.png#1
Loading...
docs/LivingOnTheEdge-AutomaticMerging.fld/image003.png#1
Loading...
docs/LivingOnTheEdge-AutomaticMerging.fld/themedata.thmx#1
Loading...
docs/LivingOnTheEdge-AutomaticMerging.html#1
Loading...
examples/automerge_cron.sh#2
Loading...
Tip: Use n and p to cycle through the changes.