#!/bin/sh # If the SDP is installed, use the default SDP instance to define the # shell environment, e.g. the correct Python path and path to P4 # executables. Otherwise, attempt to set reasonable defaults. # For details the Server Deployment Package (SDP), see: # https://swarm.workshop.perforce.com/projects/perforce-software-sdp if [[ -r /p4/common/bin/p4_vars ]]; then source /p4/common/bin/p4_vars else export P4PORT=localhost:1666 export PATH=/opt/perforce/bin:$PATH fi export P4USER=automerge export P4CLIENT=automerge_ws python /p4/common/site/automerge/automerge.py -d -v
| # | Change | User | Description | Committed | |
|---|---|---|---|---|---|
| #1 | 30556 | C. Thomas Tyler | Populate -r -S //automerge/dev. | ||
| //automerge/main/examples/automerge_cron.sh | |||||
| #2 | 30554 | C. Thomas Tyler |
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. |
||
| #1 | 30552 | C. Thomas Tyler |
Populate //guest/perforce_software/automerge/main/... //automerge/main/.... |
||
| //guest/perforce_software/automerge/main/examples/automerge_cron.sh | |||||
| #1 | 12398 | C. Thomas Tyler | Added AutoMerge project to The Workshop. | ||