Index: src/add.c
==================================================================
--- src/add.c
+++ src/add.c
@@ -91,11 +91,11 @@
 
   if( cachedManifest == -1 ){
     Blob repo;
     cachedManifest = db_get_boolean("manifest",0);
     blob_zero(&repo);
-    if( file_tree_name(g.zRepositoryName, &repo, 0) ){
+    if( file_tree_name(g.zRepositoryName, &repo, 0, 0) ){
       const char *zRepo = blob_str(&repo);
       azRepo[0] = zRepo;
       azRepo[1] = mprintf("%s-journal", zRepo);
       azRepo[2] = mprintf("%s-wal", zRepo);
       azRepo[3] = mprintf("%s-shm", zRepo);
@@ -201,11 +201,11 @@
   const char *zReserved;    /* Name of a reserved file */
   Blob repoName;            /* Treename of the repository */
   Stmt loop;                /* SQL to loop over all files to add */
   int (*xCmp)(const char*,const char*);
 
-  if( !file_tree_name(g.zRepositoryName, &repoName, 0) ){
+  if( !file_tree_name(g.zRepositoryName, &repoName, 0, 0) ){
     blob_zero(&repoName);
     zRepo = "";
   }else{
     zRepo = blob_str(&repoName);
   }
@@ -307,11 +307,11 @@
     int isDir;
     Blob fullName;
 
     /* file_tree_name() throws a fatal error if g.argv[i] is outside of the
     ** checkout. */
-    file_tree_name(g.argv[i], &fullName, 1);
+    file_tree_name(g.argv[i], &fullName, 0, 1);
     blob_reset(&fullName);
 
     file_canonical_name(g.argv[i], &fullName, 0);
     zName = blob_str(&fullName);
     isDir = file_wd_isdir(zName);
@@ -365,11 +365,11 @@
   if( !tableCreated ){
     db_multi_exec("CREATE TEMP TABLE fremove(x TEXT PRIMARY KEY %s)",
                   filename_collation());
     tableCreated = 1;
   }
-  file_canonical_name(zOldName, &fullOldName, 0);
+  file_tree_name(zOldName, &fullOldName, 1, 1);
   db_multi_exec("INSERT INTO fremove VALUES('%q');", blob_str(&fullOldName));
   blob_reset(&fullOldName);
 }
 
 /*
@@ -384,20 +384,22 @@
 */
 static void process_files_to_remove(
   int dryRunFlag /* Zero to actually operate on the file-system. */
 ){
   Stmt remove;
-  db_prepare(&remove, "SELECT x FROM fremove ORDER BY x;");
-  while( db_step(&remove)==SQLITE_ROW ){
-    const char *zOldName = db_column_text(&remove, 0);
-    if( !dryRunFlag ){
-      file_delete(zOldName);
-    }
-    fossil_print("DELETED_FILE %s\n", zOldName);
-  }
-  db_finalize(&remove);
-  db_multi_exec("DROP TABLE fremove;");
+  if( db_table_exists(db_name("temp"), "fremove") ){
+    db_prepare(&remove, "SELECT x FROM fremove ORDER BY x;");
+    while( db_step(&remove)==SQLITE_ROW ){
+      const char *zOldName = db_column_text(&remove, 0);
+      if( !dryRunFlag ){
+        file_delete(zOldName);
+      }
+      fossil_print("DELETED_FILE %s\n", zOldName);
+    }
+    db_finalize(&remove);
+    db_multi_exec("DROP TABLE fremove;");
+  }
 }
 
 /*
 ** COMMAND: rm
 ** COMMAND: delete
@@ -464,11 +466,11 @@
                 filename_collation());
   for(i=2; i<g.argc; i++){
     Blob treeName;
     char *zTreeName;
 
-    file_tree_name(g.argv[i], &treeName, 1);
+    file_tree_name(g.argv[i], &treeName, 0, 1);
     zTreeName = blob_str(&treeName);
     db_multi_exec(
        "INSERT OR IGNORE INTO sfile"
        " SELECT pathname FROM vfile"
        "  WHERE (pathname=%Q %s"
@@ -746,12 +748,12 @@
   if( !tableCreated ){
     db_multi_exec("CREATE TEMP TABLE fmove(x TEXT PRIMARY KEY %s, y TEXT %s)",
                   filename_collation(), filename_collation());
     tableCreated = 1;
   }
-  file_canonical_name(zOldName, &fullOldName, 0);
-  file_canonical_name(zNewName, &fullNewName, 0);
+  file_tree_name(zOldName, &fullOldName, 1, 1);
+  file_tree_name(zNewName, &fullNewName, 1, 1);
   db_multi_exec("INSERT INTO fmove VALUES('%q','%q');",
                 blob_str(&fullOldName), blob_str(&fullNewName));
   blob_reset(&fullNewName);
   blob_reset(&fullOldName);
 }
@@ -768,26 +770,28 @@
 */
 static void process_files_to_move(
   int dryRunFlag /* Zero to actually operate on the file-system. */
 ){
   Stmt move;
-  db_prepare(&move, "SELECT x, y FROM fmove ORDER BY x;");
-  while( db_step(&move)==SQLITE_ROW ){
-    const char *zOldName = db_column_text(&move, 0);
-    const char *zNewName = db_column_text(&move, 1);
-    if( !dryRunFlag ){
-      if( file_wd_islink(zOldName) ){
-        symlink_copy(zOldName, zNewName);
-      }else{
-        file_copy(zOldName, zNewName);
-      }
-      file_delete(zOldName);
-    }
-    fossil_print("MOVED_FILE %s\n", zOldName);
-  }
-  db_finalize(&move);
-  db_multi_exec("DROP TABLE fmove;");
+  if( db_table_exists(db_name("temp"), "fmove") ){
+    db_prepare(&move, "SELECT x, y FROM fmove ORDER BY x;");
+    while( db_step(&move)==SQLITE_ROW ){
+      const char *zOldName = db_column_text(&move, 0);
+      const char *zNewName = db_column_text(&move, 1);
+      if( !dryRunFlag ){
+        if( file_wd_islink(zOldName) ){
+          symlink_copy(zOldName, zNewName);
+        }else{
+          file_copy(zOldName, zNewName);
+        }
+        file_delete(zOldName);
+      }
+      fossil_print("MOVED_FILE %s\n", zOldName);
+    }
+    db_finalize(&move);
+    db_multi_exec("DROP TABLE fmove;");
+  }
 }
 
 /*
 ** COMMAND: mv
 ** COMMAND: rename*
@@ -860,11 +864,11 @@
     moveFiles = db_get_boolean("mv-rm-files",0);
 #else
     moveFiles = FOSSIL_MV_RM_FILE;
 #endif
   }
-  file_tree_name(zDest, &dest, 1);
+  file_tree_name(zDest, &dest, 0, 1);
   db_multi_exec(
     "UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
   );
   db_multi_exec(
     "CREATE TEMP TABLE mv(f TEXT UNIQUE ON CONFLICT IGNORE, t TEXT);"
@@ -872,11 +876,11 @@
   if( file_wd_isdir(zDest)!=1 ){
     Blob orig;
     if( g.argc!=4 ){
       usage("OLDNAME NEWNAME");
     }
-    file_tree_name(g.argv[2], &orig, 1);
+    file_tree_name(g.argv[2], &orig, 0, 1);
     db_multi_exec(
       "INSERT INTO mv VALUES(%B,%B)", &orig, &dest
     );
   }else{
     if( blob_eq(&dest, ".") ){
@@ -886,11 +890,11 @@
     }
     for(i=2; i<g.argc-1; i++){
       Blob orig;
       char *zOrig;
       int nOrig;
-      file_tree_name(g.argv[i], &orig, 1);
+      file_tree_name(g.argv[i], &orig, 0, 1);
       zOrig = blob_str(&orig);
       nOrig = blob_size(&orig);
       db_prepare(&q,
          "SELECT pathname FROM vfile"
          " WHERE vid=%d"

Index: src/checkin.c
==================================================================
--- src/checkin.c
+++ src/checkin.c
@@ -46,11 +46,11 @@
   int i;
 
   blob_zero(&where);
   for(i=2; i<g.argc; i++){
     Blob fname;
-    file_tree_name(g.argv[i], &fname, 1);
+    file_tree_name(g.argv[i], &fname, 0, 1);
     zName = blob_str(&fname);
     if( fossil_strcmp(zName, ".")==0 ){
       blob_reset(&where);
       break;
     }
@@ -296,11 +296,11 @@
 
   /* Handle given file names */
   blob_zero(&where);
   for(i=2; i<g.argc; i++){
     Blob fname;
-    file_tree_name(g.argv[i], &fname, 1);
+    file_tree_name(g.argv[i], &fname, 0, 1);
     zName = blob_str(&fname);
     if( fossil_strcmp(zName, ".")==0 ){
       blob_reset(&where);
       break;
     }
@@ -409,11 +409,11 @@
   }
   verify_all_options();
   blob_zero(&where);
   for(i=2; i<g.argc; i++){
     Blob fname;
-    file_tree_name(g.argv[i], &fname, 1);
+    file_tree_name(g.argv[i], &fname, 0, 1);
     zName = blob_str(&fname);
     if( fossil_strcmp(zName, ".")==0 ){
       blob_reset(&where);
       break;
     }
@@ -741,11 +741,11 @@
         "SELECT %Q || x FROM sfile"
         " WHERE x NOT IN (%s)"
         " ORDER BY 1",
         g.zLocalRoot, fossil_all_reserved_names(0)
     );
-    if( file_tree_name(g.zRepositoryName, &repo, 0) ){
+    if( file_tree_name(g.zRepositoryName, &repo, 0, 0) ){
       db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
     }
     db_multi_exec("DELETE FROM sfile WHERE x IN (SELECT pathname FROM vfile)");
     while( db_step(&q)==SQLITE_ROW ){
       const char *zName = db_column_text(&q, 0);
@@ -1037,11 +1037,11 @@
 
     blob_zero(&fname);
     bag_init(&toCommit);
     for(ii=2; ii<g.argc; ii++){
       int cnt = 0;
-      file_tree_name(g.argv[ii], &fname, 1);
+      file_tree_name(g.argv[ii], &fname, 0, 1);
       if( fossil_strcmp(blob_str(&fname),".")==0 ){
         bag_clear(&toCommit);
         return result;
       }
       db_prepare(&q,

Index: src/db.c
==================================================================
--- src/db.c
+++ src/db.c
@@ -1258,11 +1258,12 @@
 ** Return the name of the database "localdb", "configdb", or "repository".
 */
 const char *db_name(const char *zDb){
   assert( fossil_strcmp(zDb,"localdb")==0
        || fossil_strcmp(zDb,"configdb")==0
-       || fossil_strcmp(zDb,"repository")==0 );
+       || fossil_strcmp(zDb,"repository")==0
+       || fossil_strcmp(zDb,"temp")==0 );
   if( fossil_strcmp(zDb, g.zMainDbType)==0 ) zDb = "main";
   return zDb;
 }
 
 /*

Index: src/diff.c
==================================================================
--- src/diff.c
+++ src/diff.c
@@ -2457,11 +2457,11 @@
   verify_all_options();
 
   if( g.argc<3 ) {
     usage("FILENAME");
   }
-  file_tree_name(g.argv[2], &treename, 1);
+  file_tree_name(g.argv[2], &treename, 0, 1);
   zFilename = blob_str(&treename);
   fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename);
   if( fnid==0 ){
     fossil_fatal("no such file: %s", zFilename);
   }

Index: src/diffcmd.c
==================================================================
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -298,11 +298,11 @@
 ){
   Blob fname;
   Blob content;
   int isLink;
   int isBin;
-  file_tree_name(zFileTreeName, &fname, 1);
+  file_tree_name(zFileTreeName, &fname, 0, 1);
   historical_version_of_file(zFrom, blob_str(&fname), &content, &isLink, 0,
                              fIncludeBinary ? 0 : &isBin, 0);
   if( !isLink != !file_wd_islink(zFrom) ){
     fossil_print("%s",DIFF_CANNOT_COMPUTE_SYMLINK);
   }else{
@@ -454,11 +454,11 @@
   Blob fname;
   Blob v1, v2;
   int isLink1, isLink2;
   int isBin1, isBin2;
   if( diffFlags & DIFF_BRIEF ) return;
-  file_tree_name(zFileTreeName, &fname, 1);
+  file_tree_name(zFileTreeName, &fname, 0, 1);
   zName = blob_str(&fname);
   historical_version_of_file(zFrom, zName, &v1, &isLink1, 0,
                              fIncludeBinary ? 0 : &isBin1, 0);
   historical_version_of_file(zTo, zName, &v2, &isLink2, 0,
                              fIncludeBinary ? 0 : &isBin2, 0);

Index: src/file.c
==================================================================
--- src/file.c
+++ src/file.c
@@ -1029,18 +1029,25 @@
     blob_reset(&x);
   }
 }
 
 /*
-** Compute a pathname for a file relative to the root of the local
-** tree.  Return TRUE on success.  On failure, print and error
-** message and quit if the errFatal flag is true.  If errFatal is
-** false, then simply return 0.
-**
-** The root of the tree is defined by the g.zLocalRoot variable.
+** Compute a full path name for a file in the local tree.  If
+** the absolute flag is non-zero, the computed path will be
+** absolute, starting with the root path of the local tree;
+** otherwise, it will be relative to the root of the local
+** tree.  In both cases, the root of the local tree is defined
+** by the g.zLocalRoot variable.  Return TRUE on success.  On
+** failure, print and error message and quit if the errFatal
+** flag is true.  If errFatal is false, then simply return 0.
 */
-int file_tree_name(const char *zOrigName, Blob *pOut, int errFatal){
+int file_tree_name(
+  const char *zOrigName,
+  Blob *pOut,
+  int absolute,
+  int errFatal
+){
   Blob localRoot;
   int nLocalRoot;
   char *zLocalRoot;
   Blob full;
   int nFull;
@@ -1047,12 +1054,31 @@
   char *zFull;
   int (*xCmp)(const char*,const char*,int);
 
   blob_zero(pOut);
   if( !g.localOpen ){
-    blob_appendf(pOut, "%s", zOrigName);
-    return 1;
+    if( absolute && !file_is_absolute_path(zOrigName) ){
+      if( errFatal ){
+        fossil_fatal("relative to absolute needs open checkout tree: %s",
+                     zOrigName);
+      }
+      return 0;
+    }else{
+      /*
+      ** The original path may be relative or absolute; however, without
+      ** an open checkout tree, the only things we can do at this point
+      ** is return it verbatim or generate a fatal error.  The caller is
+      ** probably expecting a tree-relative path name will be returned;
+      ** however, most places where this function is called already check
+      ** if the local checkout tree is open, either directly or indirectly,
+      ** which would make this situation impossible.  Alternatively, they
+      ** could check the returned path using the file_is_absolute_path()
+      ** function.
+      */
+      blob_appendf(pOut, "%s", zOrigName);
+      return 1;
+    }
   }
   file_canonical_name(g.zLocalRoot, &localRoot, 1);
   nLocalRoot = blob_size(&localRoot);
   zLocalRoot = blob_buffer(&localRoot);
   assert( nLocalRoot>0 && zLocalRoot[nLocalRoot-1]=='/' );
@@ -1066,11 +1092,15 @@
   }
 
   /* Special case.  zOrigName refers to g.zLocalRoot directory. */
   if( (nFull==nLocalRoot-1 && xCmp(zLocalRoot, zFull, nFull)==0)
       || (nFull==1 && zFull[0]=='/' && nLocalRoot==1 && zLocalRoot[0]=='/') ){
-    blob_append(pOut, ".", 1);
+    if( absolute ){
+      blob_append(pOut, zLocalRoot, nLocalRoot);
+    }else{
+      blob_append(pOut, ".", 1);
+    }
     blob_reset(&localRoot);
     blob_reset(&full);
     return 1;
   }
 
@@ -1080,11 +1110,20 @@
     if( errFatal ){
       fossil_fatal("file outside of checkout tree: %s", zOrigName);
     }
     return 0;
   }
-  blob_append(pOut, &zFull[nLocalRoot], nFull-nLocalRoot);
+  if( absolute ){
+    if( !file_is_absolute_path(zOrigName) ){
+      blob_append(pOut, zLocalRoot, nLocalRoot);
+    }
+    blob_append(pOut, zOrigName, -1);
+    blob_resize(pOut, file_simplify_name(blob_buffer(pOut),
+                                         blob_size(pOut), 0));
+  }else{
+    blob_append(pOut, &zFull[nLocalRoot], nFull-nLocalRoot);
+  }
   blob_reset(&localRoot);
   blob_reset(&full);
   return 1;
 }
 
@@ -1092,20 +1131,22 @@
 ** COMMAND:  test-tree-name
 **
 ** Test the operation of the tree name generator.
 **
 ** Options:
+**   --absolute           Return an absolute path instead of a relative one.
 **   --case-sensitive B   Enable or disable case-sensitive filenames.  B is
 **                        a boolean: "yes", "no", "true", "false", etc.
 */
 void cmd_test_tree_name(void){
   int i;
   Blob x;
+  int absoluteFlag = find_option("absolute",0,0)!=0;
   db_find_and_open_repository(0,0);
   blob_zero(&x);
   for(i=2; i<g.argc; i++){
-    if( file_tree_name(g.argv[i], &x, 1) ){
+    if( file_tree_name(g.argv[i], &x, absoluteFlag, 1) ){
       fossil_print("%s\n", blob_buffer(&x));
       blob_reset(&x);
     }
   }
 }

Index: src/finfo.c
==================================================================
--- src/finfo.c
+++ src/finfo.c
@@ -73,11 +73,11 @@
     vid = db_lget_int("checkout", 0);
     if( vid==0 ){
       fossil_fatal("no checkout to finfo files in");
     }
     vfile_check_signature(vid, CKSIG_ENOTFILE);
-    file_tree_name(g.argv[2], &fname, 1);
+    file_tree_name(g.argv[2], &fname, 0, 1);
     db_prepare(&q,
         "SELECT pathname, deleted, rid, chnged, coalesce(origname!=pathname,0)"
         "  FROM vfile WHERE vfile.pathname=%B %s",
         &fname, filename_collation());
     blob_zero(&line);
@@ -122,11 +122,11 @@
     const char *zRevision = find_option("revision", "r", 1);
 
     /* We should be done with options.. */
     verify_all_options();
 
-    file_tree_name(g.argv[2], &fname, 1);
+    file_tree_name(g.argv[2], &fname, 0, 1);
     if( zRevision ){
       historical_version_of_file(zRevision, blob_str(&fname), &record, 0,0,0,0);
     }else{
       int rid = db_int(0, "SELECT rid FROM vfile WHERE pathname=%B %s",
                        &fname, filename_collation());
@@ -174,11 +174,11 @@
     verify_all_options();
 
     if( g.argc!=3 ){
       usage("?-l|--log? ?-b|--brief? FILENAME");
     }
-    file_tree_name(g.argv[2], &fname, 1);
+    file_tree_name(g.argv[2], &fname, 0, 1);
     rid = db_int(0, "SELECT rid FROM vfile WHERE pathname=%B %s",
                  &fname, filename_collation());
     if( rid==0 ){
       fossil_fatal("no history for file: %b", &fname);
     }
@@ -259,11 +259,11 @@
 
   /* We should be done with options.. */
   verify_all_options();
 
   for(i=2; i<g.argc; i++){
-    file_tree_name(g.argv[i], &fname, 1);
+    file_tree_name(g.argv[i], &fname, 0, 1);
     blob_zero(&content);
     rc = historical_version_of_file(zRev, blob_str(&fname), &content, 0,0,0,2);
     if( rc==2 ){
       fossil_fatal("no such file: %s", g.argv[i]);
     }

Index: src/stash.c
==================================================================
--- src/stash.c
+++ src/stash.c
@@ -58,11 +58,11 @@
   Blob sql;             /* Query statement text */
   Stmt q;               /* Query against the vfile table */
   Stmt ins;             /* Insert statement */
 
   zFile = mprintf("%/", zFName);
-  file_tree_name(zFile, &fname, 1);
+  file_tree_name(zFile, &fname, 0, 1);
   zTreename = blob_str(&fname);
   blob_zero(&sql);
   blob_append_sql(&sql,
     "SELECT deleted, isexe, islink, mrid, pathname, coalesce(origname,pathname)"
     "  FROM vfile"

Index: src/timeline.c
==================================================================
--- src/timeline.c
+++ src/timeline.c
@@ -2085,11 +2085,11 @@
     if( zType==0 ){
       /* When zFilePattern is specified and type is not specified, only show
        * file check-ins */
       zType="ci";
     }
-    file_tree_name(zFilePattern, &treeName, 1);
+    file_tree_name(zFilePattern, &treeName, 0, 1);
     if( fossil_strcmp(blob_str(&treeName), ".")==0 ){
       /* When zTreeName refers to g.zLocalRoot, it's like not specifying
        * zFilePattern. */
       zFilePattern = 0;
     }

Index: src/undo.c
==================================================================
--- src/undo.c
+++ src/undo.c
@@ -437,11 +437,11 @@
         fossil_fatal("nothing to %s", zCmd);
       }
       for(i=2; i<g.argc; i++){
         const char *zFile = g.argv[i];
         Blob path;
-        file_tree_name(zFile, &path, 1);
+        file_tree_name(zFile, &path, 0, 1);
         undo_one(blob_str(&path), isRedo);
         blob_reset(&path);
       }
     }
     vid2 = db_lget_int("checkout", 0);

Index: src/update.c
==================================================================
--- src/update.c
+++ src/update.c
@@ -352,11 +352,11 @@
 
     blob_zero(&sql);
     blob_append(&sql, "DELETE FROM fv WHERE ", -1);
     zSep = "";
     for(i=3; i<g.argc; i++){
-      file_tree_name(g.argv[i], &treename, 1);
+      file_tree_name(g.argv[i], &treename, 0, 1);
       if( file_wd_isdir(g.argv[i])==1 ){
         if( blob_size(&treename) != 1 || blob_str(&treename)[0] != '.' ){
           blob_append_sql(&sql, "%sfn NOT GLOB '%q/*' ",
                          zSep /*safe-for-%s*/, blob_str(&treename));
         }else{
@@ -738,11 +738,11 @@
 
   if( g.argc>2 ){
     for(i=2; i<g.argc; i++){
       Blob fname;
       zFile = mprintf("%/", g.argv[i]);
-      file_tree_name(zFile, &fname, 1);
+      file_tree_name(zFile, &fname, 0, 1);
       db_multi_exec(
         "REPLACE INTO torevert VALUES(%B);"
         "INSERT OR IGNORE INTO torevert"
         " SELECT pathname"
         "   FROM vfile"

Index: test/file1.test
==================================================================
--- test/file1.test
+++ test/file1.test
@@ -33,10 +33,28 @@
     fossil test-relative-name --chdir $subdir $path
     test relative-name-$testname.$i {$::RESULT==$result}
     incr i
   }
 }
+
+proc relative-tree-name {testname args} {
+  set i 1
+  foreach {subdir path result} $args {
+    fossil test-tree-name --chdir $subdir $path
+    test relative-tree-name-$testname.$i {$::RESULT==$result}
+    incr i
+  }
+}
+
+proc absolute-tree-name {testname args} {
+  set i 1
+  foreach {subdir path result} $args {
+    fossil test-tree-name --chdir $subdir --absolute $path
+    test absolute-tree-name-$testname.$i {$::RESULT==$result}
+    incr i
+  }
+}
 
 simplify-name 100 . . .// . .. .. ..///// ..
 simplify-name 101 {} {} / / ///////// / ././././ .
 simplify-name 102 x x /x /x ///x //x
 simplify-name 103 a/b a/b /a/b /a/b a///b a/b ///a///b///// //a/b
@@ -55,8 +73,21 @@
 file mkdir test1/test2
 
 relative-name 100 . . . test1 [pwd] .. test1 [pwd]/ .. test1 [pwd]/test ../test
 relative-name 101 test1/test2 [pwd] ../.. test1/test2 [pwd]/ ../.. test1/test2 [pwd]/test ../../test
 relative-name 102 test1 [pwd]/test ../test . [pwd]/file1 ./file1 . [pwd]/file1/file2 ./file1/file2
+relative-name 103 . [pwd] .
+
+relative-tree-name 100 . . file1 test1 [pwd] file1 test1 [pwd]/ file1 test1 [pwd]/test file1/test
+relative-tree-name 101 test1/test2 [pwd] file1 test1/test2 [pwd]/ file1 test1/test2 [pwd]/test file1/test
+relative-tree-name 102 test1 [pwd]/test file1/test . [pwd]/file1 file1/file1 . [pwd]/file1/file2 file1/file1/file2
+relative-tree-name 103 . [pwd] file1
+
+set dirname [file normalize [file dirname [pwd]]]
+
+absolute-tree-name 100 . . $dirname test1 [pwd] [pwd] test1 [pwd]/ $dirname/file1 test1 [pwd]/test $dirname/file1/test
+absolute-tree-name 101 test1/test2 [pwd] $dirname/file1 test1/test2 [pwd]/ $dirname/file1 test1/test2 [pwd]/test $dirname/file1/test
+absolute-tree-name 102 test1 [pwd]/test $dirname/file1/test . [pwd]/file1 $dirname/file1/file1 . [pwd]/file1/file2 $dirname/file1/file1/file2
+absolute-tree-name 103 . [pwd] $dirname/file1
 
 catch {file delete test1/test2}
 catch {file delete test1}

Index: test/merge6.test
==================================================================
--- test/merge6.test
+++ test/merge6.test
@@ -23,26 +23,26 @@
 ####################################################################
 
 repo_init
 fossil ls
 
-test merge_multi-0 {[string map [list \r\n \n] [string trim $RESULT]] eq {}}
+test merge_multi-0 {[normalize_result] eq {}}
 
 write_file f1 "f1 line"
 fossil add f1
 fossil commit -m "base file"
 fossil ls
 
-test merge_multi-1 {[string map [list \r\n \n] [string trim $RESULT]] eq {f1}}
+test merge_multi-1 {[normalize_result] eq {f1}}
 
 fossil update trunk
 write_file f2 "f2 line"
 fossil add f2
 fossil commit -m "branch for file f2" -b branch_for_f2
 fossil ls
 
-test merge_multi-2 {[string map [list \r\n \n] [string trim $RESULT]] eq {f1
+test merge_multi-2 {[normalize_result] eq {f1
 f2}}
 
 fossil update trunk
 write_file f3 "f3 line"
 write_file f4 "f4 line"
@@ -49,19 +49,19 @@
 fossil add f3
 fossil add f4
 fossil commit -m "branch for files f3 and f4" -b branch_for_f3_f4
 fossil ls
 
-test merge_multi-3 {[string map [list \r\n \n] [string trim $RESULT]] eq {f1
+test merge_multi-3 {[normalize_result] eq {f1
 f3
 f4}}
 
 fossil update trunk
 fossil merge branch_for_f2
 fossil merge branch_for_f3_f4
 fossil commit -m "new trunk files f2, f3, and f4 via merge"
 fossil ls
 
-test merge_multi-4 {[string map [list \r\n \n] [string trim $RESULT]] eq {f1
+test merge_multi-4 {[normalize_result] eq {f1
 f2
 f3
 f4}}

Index: test/merge_renames.test
==================================================================
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -197,11 +197,11 @@
 fossil merge trunk
 fossil commit -m "trunk merged, should have 3 files"
 
 fossil ls
 
-test merge_renames-5 {[string map [list \r\n \n] [string trim $RESULT]] eq {f1
+test merge_renames-5 {[normalize_result] eq {f1
 f2
 f3}}
 
 ######################################
 #

ADDED   test/mv-rm.test
Index: test/mv-rm.test
==================================================================
--- /dev/null
+++ test/mv-rm.test
@@ -0,0 +1,392 @@
+#
+# Copyright (c) 2011 D. Richard Hipp
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the Simplified BSD License (also
+# known as the "2-Clause License" or "FreeBSD License".)
+#
+# This program is distributed in the hope that it will be useful,
+# but without any warranty; without even the implied warranty of
+# merchantability or fitness for a particular purpose.
+#
+# Author contact information:
+#   drh@hwaci.com
+#   http://www.hwaci.com/drh/
+#
+############################################################################
+#
+# MV / RM Commands
+#
+
+catch {exec $::fossilexe info} res
+puts res=$res
+if {![regexp {use --repository} $res]} {
+  puts stderr "Cannot run this test within an open checkout"
+  return
+}
+
+########################################
+# Setup: Add Files and Commit          #
+########################################
+
+set rootDir [file normalize [pwd]]
+
+set undoMsg "\n \"fossil undo\" is\
+available to undo changes to the\
+working checkout."
+
+repo_init
+
+write_file f1 "f1"
+write_file f2 "f2"
+write_file f3 "f3"
+write_file f4 "f4"
+write_file f5 "f5"
+write_file f6 "f6"
+write_file f7 "f7"
+write_file f8 "f8"
+
+file mkdir [file join $rootDir subdirA]
+# NOTE: There are no files in subdirA.
+
+file mkdir [file join $rootDir subdirB]
+write_file [file join $rootDir subdirB f9] "f9"
+
+file mkdir [file join $rootDir subdirC]
+write_file [file join $rootDir subdirC f10] "f10"
+write_file [file join $rootDir subdirC f11] "f11"
+
+fossil add f1 f2 f3 f4 f5 f6 f7 f8 subdirB/f9 subdirC/f10 subdirC/f11
+fossil commit -m "c1"
+
+########################################
+# Test 1: Soft Move Relative Directory #
+########################################
+
+file mkdir [file join $rootDir subdir1]
+cd [file join $rootDir subdir1]
+
+fossil mv ../f1 .
+test mv-soft-relative-1 {$RESULT eq "RENAME f1 subdir1/f1"}
+
+fossil revert
+test mv-soft-relative-2 {
+  [normalize_result] eq "DELETE: subdir1/f1\nREVERTED: f1${undoMsg}"
+}
+
+cd $rootDir
+
+###################################
+# Test 2: Soft Move Relative File #
+###################################
+
+file mkdir [file join $rootDir subdir2]
+cd [file join $rootDir subdir2]
+
+fossil mv ../f2 ./f2
+test mv-soft-relative-3 {$RESULT eq "RENAME f2 subdir2/f2"}
+
+fossil revert
+test mv-soft-relative-4 {
+  [normalize_result] eq "DELETE: subdir2/f2\nREVERTED: f2${undoMsg}"
+}
+
+cd $rootDir
+
+########################################
+# Test 3: Hard Move Relative Directory #
+########################################
+
+file mkdir [file join $rootDir subdir3]
+cd [file join $rootDir subdir3]
+
+fossil mv --hard ../f3 .
+test mv-hard-relative-1 {
+  [normalize_result] eq "RENAME f3 subdir3/f3\nMOVED_FILE ${rootDir}/f3"
+}
+
+fossil revert
+test mv-hard-relative-2 {
+  [normalize_result] eq "DELETE: subdir3/f3\nREVERTED: f3${undoMsg}"
+}
+
+cd $rootDir
+
+###################################
+# Test 4: Hard Move Relative File #
+###################################
+
+file mkdir [file join $rootDir subdir4]
+cd [file join $rootDir subdir4]
+
+fossil mv --hard ../f4 ./f4
+test mv-hard-relative-3 {
+  [normalize_result] eq "RENAME f4 subdir4/f4\nMOVED_FILE ${rootDir}/f4"
+}
+
+fossil revert
+test mv-hard-relative-4 {
+  [normalize_result] eq "DELETE: subdir4/f4\nREVERTED: f4${undoMsg}"
+}
+
+cd $rootDir
+
+########################################
+# Test 5: Soft Move Absolute Directory #
+########################################
+
+file mkdir [file join $rootDir subdir5]
+cd [file join $rootDir subdir5]
+
+fossil mv [file join $rootDir f5] [file join $rootDir subdir5]
+test mv-soft-absolute-1 {$RESULT eq "RENAME f5 subdir5/f5"}
+
+fossil revert
+test mv-soft-absolute-2 {
+  [normalize_result] eq "DELETE: subdir5/f5\nREVERTED: f5${undoMsg}"
+}
+
+cd $rootDir
+
+###################################
+# Test 6: Soft Move Absolute File #
+###################################
+
+file mkdir [file join $rootDir subdir6]
+cd [file join $rootDir subdir6]
+
+fossil mv [file join $rootDir f6] [file join $rootDir subdir6 f6]
+test mv-soft-absolute-3 {$RESULT eq "RENAME f6 subdir6/f6"}
+
+fossil revert
+test mv-soft-absolute-4 {
+  [normalize_result] eq "DELETE: subdir6/f6\nREVERTED: f6${undoMsg}"
+}
+
+cd $rootDir
+
+########################################
+# Test 7: Hard Move Absolute Directory #
+########################################
+
+file mkdir [file join $rootDir subdir7]
+cd [file join $rootDir subdir7]
+
+fossil mv --hard [file join $rootDir f7] [file join $rootDir subdir7]
+test mv-hard-absolute-1 {
+  [normalize_result] eq "RENAME f7 subdir7/f7\nMOVED_FILE ${rootDir}/f7"
+}
+
+fossil revert
+test mv-hard-absolute-2 {
+  [normalize_result] eq "DELETE: subdir7/f7\nREVERTED: f7${undoMsg}"
+}
+
+cd $rootDir
+
+###################################
+# Test 8: Hard Move Absolute File #
+###################################
+
+file mkdir [file join $rootDir subdir8]
+cd [file join $rootDir subdir8]
+
+fossil mv --hard [file join $rootDir f8] [file join $rootDir subdir8 f8]
+test mv-hard-absolute-3 {
+  [normalize_result] eq "RENAME f8 subdir8/f8\nMOVED_FILE ${rootDir}/f8"
+}
+
+fossil revert
+test mv-hard-absolute-4 {
+  [normalize_result] eq "DELETE: subdir8/f8\nREVERTED: f8${undoMsg}"
+}
+
+cd $rootDir
+
+##########################################
+# Test 9: Soft Remove Relative Directory #
+##########################################
+
+file mkdir [file join $rootDir subdir1]
+cd [file join $rootDir subdir1]
+
+fossil rm ../subdirA
+test rm-soft-relative-1 {$RESULT eq ""}
+
+fossil rm ../subdirB
+test rm-soft-relative-2 {$RESULT eq "DELETED subdirB/f9"}
+
+fossil rm ../subdirC
+test rm-soft-relative-3 {
+  [normalize_result] eq "DELETED subdirC/f10\nDELETED subdirC/f11"
+}
+
+fossil revert
+test rm-soft-relative-4 {
+  [normalize_result] eq \
+  "REVERTED: subdirB/f9\nREVERTED: subdirC/f10\nREVERTED: subdirC/f11${undoMsg}"
+}
+
+cd $rootDir
+
+######################################
+# Test 10: Soft Remove Relative File #
+######################################
+
+file mkdir [file join $rootDir subdir2]
+cd [file join $rootDir subdir2]
+
+fossil rm ../f2
+test rm-soft-relative-5 {$RESULT eq "DELETED f2"}
+
+fossil revert
+test rm-soft-relative-6 {
+  [normalize_result] eq "REVERTED: f2${undoMsg}"
+}
+
+cd $rootDir
+
+###########################################
+# Test 11: Hard Remove Relative Directory #
+###########################################
+
+file mkdir [file join $rootDir subdir3]
+cd [file join $rootDir subdir3]
+
+fossil rm --hard ../subdirA
+test rm-hard-relative-1 {
+  [normalize_result] eq ""
+}
+
+fossil rm --hard ../subdirB
+test rm-hard-relative-2 {
+  [normalize_result] eq \
+  "DELETED subdirB/f9\nDELETED_FILE ${rootDir}/subdirB/f9"
+}
+
+fossil rm --hard ../subdirC
+test rm-hard-relative-3 {
+  [normalize_result] eq \
+  "DELETED subdirC/f10\nDELETED subdirC/f11\nDELETED_FILE\
+${rootDir}/subdirC/f10\nDELETED_FILE ${rootDir}/subdirC/f11"
+}
+
+fossil revert
+test rm-hard-relative-4 {
+  [normalize_result] eq \
+  "REVERTED: subdirB/f9\nREVERTED: subdirC/f10\nREVERTED: subdirC/f11${undoMsg}"
+}
+
+cd $rootDir
+
+######################################
+# Test 12: Hard Remove Relative File #
+######################################
+
+file mkdir [file join $rootDir subdir4]
+cd [file join $rootDir subdir4]
+
+fossil rm --hard ../f4
+test rm-hard-relative-5 {
+  [normalize_result] eq "DELETED f4\nDELETED_FILE ${rootDir}/f4"
+}
+
+fossil revert
+test rm-hard-relative-6 {
+  [normalize_result] eq "REVERTED: f4${undoMsg}"
+}
+
+cd $rootDir
+
+###########################################
+# Test 13: Soft Remove Absolute Directory #
+###########################################
+
+file mkdir [file join $rootDir subdir5]
+cd [file join $rootDir subdir5]
+
+fossil rm [file join $rootDir subdirA]
+test rm-soft-absolute-1 {$RESULT eq ""}
+
+fossil rm [file join $rootDir subdirB]
+test rm-soft-absolute-2 {$RESULT eq "DELETED subdirB/f9"}
+
+fossil rm [file join $rootDir subdirC]
+test rm-soft-absolute-3 {
+  [normalize_result] eq "DELETED subdirC/f10\nDELETED subdirC/f11"
+}
+
+fossil revert
+test rm-soft-absolute-4 {
+  [normalize_result] eq \
+  "REVERTED: subdirB/f9\nREVERTED: subdirC/f10\nREVERTED: subdirC/f11${undoMsg}"
+}
+
+cd $rootDir
+
+######################################
+# Test 14: Soft Remove Absolute File #
+######################################
+
+file mkdir [file join $rootDir subdir6]
+cd [file join $rootDir subdir6]
+
+fossil rm [file join $rootDir f6]
+test rm-soft-absolute-5 {$RESULT eq "DELETED f6"}
+
+fossil revert
+test rm-soft-absolute-6 {
+  [normalize_result] eq "REVERTED: f6${undoMsg}"
+}
+
+cd $rootDir
+
+###########################################
+# Test 15: Hard Remove Absolute Directory #
+###########################################
+
+file mkdir [file join $rootDir subdir7]
+cd [file join $rootDir subdir7]
+
+fossil rm --hard [file join $rootDir subdirA]
+test rm-hard-absolute-1 {$RESULT eq ""}
+
+fossil rm --hard [file join $rootDir subdirB]
+test rm-hard-absolute-2 {
+  [normalize_result] eq \
+  "DELETED subdirB/f9\nDELETED_FILE ${rootDir}/subdirB/f9"
+}
+
+fossil rm --hard [file join $rootDir subdirC]
+test rm-hard-absolute-3 {
+  [normalize_result] eq \
+  "DELETED subdirC/f10\nDELETED subdirC/f11\nDELETED_FILE\
+${rootDir}/subdirC/f10\nDELETED_FILE ${rootDir}/subdirC/f11"
+}
+
+fossil revert
+test rm-hard-absolute-4 {
+  [normalize_result] eq \
+  "REVERTED: subdirB/f9\nREVERTED: subdirC/f10\nREVERTED: subdirC/f11${undoMsg}"
+}
+
+cd $rootDir
+
+######################################
+# Test 16: Hard Remove Absolute File #
+######################################
+
+file mkdir [file join $rootDir subdir8]
+cd [file join $rootDir subdir8]
+
+fossil rm --hard [file join $rootDir f8]
+test rm-hard-absolute-5 {
+  [normalize_result] eq "DELETED f8\nDELETED_FILE ${rootDir}/f8"
+}
+
+fossil revert
+test rm-hard-absolute-6 {
+  [normalize_result] eq "REVERTED: f8${undoMsg}"
+}
+
+cd $rootDir

Index: test/th1-tcl.test
==================================================================
--- test/th1-tcl.test
+++ test/th1-tcl.test
@@ -54,20 +54,18 @@
 \d+
 two words
 4
 \d+
 one_word
-three words now
-$} [string map [list \r\n \n] $RESULT]]}
+three words now$} [normalize_result]]}
 
 ###############################################################################
 
 fossil test-th-render --open-config \
     [file nativename [file join $dir th1-tcl2.txt]]
 
-test th1-tcl-2 {[regexp -- {^\d+
-$} [string map [list \r\n \n] $RESULT]]}
+test th1-tcl-2 {[regexp -- {^\d+$} [normalize_result]]}
 
 ###############################################################################
 
 fossil test-th-render --open-config \
     [file nativename [file join $dir th1-tcl3.txt]]

Index: test/th1.test
==================================================================
--- test/th1.test
+++ test/th1.test
@@ -591,17 +591,17 @@
 
 ###############################################################################
 
 fossil test-th-eval --th-trace "trace {}"
 if {$th1Hooks} {
-  test th1-trace-2 {[string map [list \r\n \n] [string trim $RESULT]] eq \
+  test th1-trace-2 {[normalize_result] eq \
 {------------------ BEGIN TRACE LOG ------------------
 th1-init 0x0 => 0x0<br />
 
 ------------------- END TRACE LOG -------------------}}
 } else {
-  test th1-trace-2 {[string map [list \r\n \n] [string trim $RESULT]] eq \
+  test th1-trace-2 {[normalize_result] eq \
       {------------------ BEGIN TRACE LOG ------------------
 th1-init 0x0 => 0x0<br />
 th1-setup {} => TH_OK<br />
 
 ------------------- END TRACE LOG -------------------}}
@@ -614,17 +614,17 @@
 
 ###############################################################################
 
 fossil test-th-eval --th-trace "trace {this is a trace message.}"
 if {$th1Hooks} {
-  test th1-trace-4 {[string map [list \r\n \n] [string trim $RESULT]] eq \
+  test th1-trace-4 {[normalize_result] eq \
       {------------------ BEGIN TRACE LOG ------------------
 th1-init 0x0 => 0x0<br />
 this is a trace message.
 ------------------- END TRACE LOG -------------------}}
 } else {
-  test th1-trace-4 {[string map [list \r\n \n] [string trim $RESULT]] eq \
+  test th1-trace-4 {[normalize_result] eq \
       {------------------ BEGIN TRACE LOG ------------------
 th1-init 0x0 => 0x0<br />
 th1-setup {} => TH_OK<br />
 this is a trace message.
 ------------------- END TRACE LOG -------------------}}