Fossil

Check-in [4cfe13e9]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Correction in comment, no change in functionality.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | per-round-trip-commit
Files: files | file ages | folders
SHA1:4cfe13e962a95fe972c3a783aa65f5f42d606269
User & Date: andybradford 2014-05-09 03:03:26
Context
2014-05-20
05:23
Process xfer-ticket-script for each round-trip to avoid lost hook invocations (thanks to Jan Nijtmans for catching this). check-in: 28a24c4b user: andybradford tags: per-round-trip-commit
2014-05-09
03:03
Correction in comment, no change in functionality. check-in: 4cfe13e9 user: andybradford tags: per-round-trip-commit
2014-05-08
05:52
Abort update or merge operation if there is content missing from files. Add --force-missing option to allow override if desired. check-in: f2adddfe user: andybradford tags: per-round-trip-commit
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/update.c.

99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
void update_cmd(void){
  int vid;              /* Current version */
  int tid=0;            /* Target version - version we are changing to */
  Stmt q;
  int latestFlag;       /* --latest.  Pick the latest version if true */
  int dryRunFlag;       /* -n or --dry-run.  Do a dry run */
  int verboseFlag;      /* -v or --verbose.  Output extra information */
  int forceMissingFlag; /* -f or --force.    Continue if missing content */
  int debugFlag;        /* --debug option */
  int setmtimeFlag;     /* --setmtime.  Set mtimes on files */
  int nChng;            /* Number of file renames */
  int *aChng;           /* Array of file renames */
  int i;                /* Loop counter */
  int nConflict = 0;    /* Number of merge conflicts */
  int nOverwrite = 0;   /* Number of unmanaged files overwritten */







|







99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
void update_cmd(void){
  int vid;              /* Current version */
  int tid=0;            /* Target version - version we are changing to */
  Stmt q;
  int latestFlag;       /* --latest.  Pick the latest version if true */
  int dryRunFlag;       /* -n or --dry-run.  Do a dry run */
  int verboseFlag;      /* -v or --verbose.  Output extra information */
  int forceMissingFlag; /* --force-missing.  Continue if missing content */
  int debugFlag;        /* --debug option */
  int setmtimeFlag;     /* --setmtime.  Set mtimes on files */
  int nChng;            /* Number of file renames */
  int *aChng;           /* Array of file renames */
  int i;                /* Loop counter */
  int nConflict = 0;    /* Number of merge conflicts */
  int nOverwrite = 0;   /* Number of unmanaged files overwritten */