Changes between Version 12 and Version 13 of UpdatingFromSource


Ignore:
Timestamp:
Sep 26, 2009, 8:56:01 AM (10 years ago)
Author:
gb
Comment:

Note svn 1.5+ interactive update options.

Legend:

Unmodified
Added
Removed
Modified
  • UpdatingFromSource

    v12 v13  
    3737will effectively discard any local changes to `some-file` and replace it with the repository version.
    3838
     39Note that version 1.5 and later of svn will offer a menu of options that can be used to resolve conflicts during "svn update", at least when it believes that it's running interactively.  The option "tf" ("theirs full") will overwrite a local file with the repository version, which is generally appropriate when binary files change.
     40
    39413.  Once svn has finished creating local copies of files that have changed on the svn server since the last time you did this (or since the tarballs were created), use the currently installed Clozure CL to compile the updated sources and build a new kernel and heap image:
    4042