From 280efbafbcfcef64603882452375b8eed6745dc0 Mon Sep 17 00:00:00 2001 From: Greg Wilson Date: Mon, 22 Apr 2013 15:26:06 -0400 Subject: [PATCH] Adding durations --- svn.html | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/svn.html b/svn.html index aa20306..5eb0358 100644 --- a/svn.html +++ b/svn.html @@ -191,6 +191,9 @@
  • Compare the current state of a working copy to the last update from the repository, and to the current state of the repository.
  • Explain what "version 123 of xyz.txt" actually means.
  • +

    + 20 minutes. +

    @@ -1012,6 +1015,9 @@ $ svn blame moons.txt

  • Resolve a conflict.
  • Identify the auxiliary files created when a conflict occurs.
  • +

    + 20 minutes. +

    @@ -1381,6 +1387,9 @@ Elara 11740 259.6528 0.008 40.0

  • Recover an old version of a file.
  • Explain what branches are and when they are used.
  • +

    + 20 minutes. +

    @@ -1669,13 +1678,17 @@ svn diff -r 240:261 fish.dat

    -

    Setting up a Repository

    +

    Setting Up a Repository

    Learning Objectives

    • How to create a repository.
    +

    + 25 minutes + (mostly discussion about where to host repositories). +

    @@ -1955,12 +1968,16 @@ svn+ssh://dracula@serv.euphoric.edu/home/dracula/repos/missions

    Provenance

    -

    Understand:

    +

    Learning Objectives

    • What data provenance is.
    • How to embed version numbers and other information in files managed by version control.
    • How to record version information about a program in its output.
    +

    + 20 minutes + (without a practical exercise). +

    -- 2.26.2