<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sect1 SYSTEM "../../../dtd/dblite.dtd">
<sect1 id="tsvn-dug-rename">
  <title>Deleting, Moving and Renaming</title>
  <para>
    Subversion allows renaming and moving of files and
    folders. So there are menu entries for delete and rename
    in the TortoiseSVN submenu.
    <figure id="tsvn-dug-renaming-dia-1">
      <title>Explorer context menu for versioned files</title>
      <graphic fileref="../images/ContextMenuFileControl.png"/>
    </figure>
  </para>
  <sect2 id="tsvn-dug-rename-delete">
    <title>Deleting files and folders</title>
    <indexterm>
      <primary>delete</primary>
    </indexterm>
    <indexterm>
      <primary>remove</primary>
    </indexterm>
    <para>
      Use
      <menuchoice>
        <guimenu>TortoiseSVN</guimenu>
        <guimenuitem>Delete</guimenuitem>
      </menuchoice>
      to remove files or folders from Subversion.
    </para>
    <para>
      When you
      <menuchoice>
        <guimenu>TortoiseSVN</guimenu>
        <guimenuitem>Delete</guimenuitem>
      </menuchoice>
      a file or folder, it is removed from your working copy immediately as well
      as being marked for deletion in the repository on next commit.
      The item's parent folder shows a <quote>modified</quote> icon overlay.
      Up until you commit the change, you can get the file back using
      <menuchoice>
        <guimenu>TortoiseSVN</guimenu>
        <guimenuitem>Revert</guimenuitem>
      </menuchoice>
      on the parent folder.
    </para>
    <para>
      If you want to delete an item from the repository, but keep it
      locally as an unversioned file/folder, use
      <menuchoice>
        <guimenu>Extended Context Menu</guimenu>
        <guimenuitem>Delete (keep local)</guimenuitem>
      </menuchoice>.
      You have to hold the <keycap>Shift</keycap> key while right clicking on
      the item in the explorer list pane (right pane) in order to see this
      in the extended context menu.
    </para>
    <para>
      If an item is deleted via the explorer
      instead of using the TortoiseSVN context menu, the commit
      dialog shows those items as missing and lets you remove them from
      version control too before the commit. However, if you update
      your working copy, Subversion will spot the missing item and
      replace it with the latest version from the repository.
      If you need to delete a version-controlled file, always use
      <menuchoice>
        <guimenu>TortoiseSVN</guimenu>
        <guimenuitem>Delete</guimenuitem>
      </menuchoice> so that Subversion doesn't have to guess what
      you really want to do.
    </para>
    <tip>
      <title>Getting a deleted file or folder back</title>
      <para>
        If you have deleted a file or a folder and already committed
        that delete operation to the repository, then a normal
        <menuchoice>
          <guimenu>TortoiseSVN</guimenu>
          <guimenuitem>Revert</guimenuitem>
        </menuchoice>
        can't bring it back anymore. But the file or folder is not
        lost at all. If you know the revision the file or folder got
        deleted (if you don't, use the log dialog to find out) open
        the repository browser and switch to that revision. Then select
        the file or folder you deleted, right click and select
        <menuchoice>
          <guimenu>Context Menu</guimenu>
          <guimenuitem>Copy to...</guimenuitem>
        </menuchoice>
        as the target for that copy operation select the path to your
        working copy.
      </para>
    </tip>
  </sect2>
  <sect2 id="tsvn-dug-rename-move">
    <title>Moving files and folders</title>
    <indexterm>
      <primary>rename</primary>
    </indexterm>
    <indexterm>
      <primary>move</primary>
    </indexterm>
    <?dbhh topicname="HIDD_RENAME"?>
    <para>
      If you want to do a simple in-place rename of a file or
      folder, use
      <menuchoice>
        <guimenu>Context Menu</guimenu>
        <guimenuitem>Rename...</guimenuitem>
      </menuchoice>
      Enter the new name for the item and you're done.
    </para>
    <para>
      If you want to move files around inside your working copy,
      perhaps to a different sub-folder,
      use the right mouse drag-and-drop handler:
      <orderedlist>
        <listitem>
          <para>
            select the files or directories you want to move
          </para>
        </listitem>
        <listitem>
          <para>
            <action>right drag</action> them to the
            new location inside the working copy
          </para>
        </listitem>
        <listitem>
          <para>
            release the right mouse button
          </para>
        </listitem>
        <listitem>
          <para>
            in the popup menu select
            <menuchoice>
              <guimenu>Context Menu</guimenu>
              <guimenuitem>SVN Move versioned files here</guimenuitem>
            </menuchoice>
          </para>
        </listitem>
      </orderedlist>
    </para>
    <caution>
      <title>Commit the parent folder</title>
      <para>
        Since renames and moves are done as a delete followed by an
        add you must commit the parent folder of the renamed/moved
        file so that the deleted part of the rename/move will
        show up in the commit dialog. If you don't commit the removed
        part of the rename/move, it will stay behind in the repository
        and when your co-workers update, the old file will not be
        removed. i.e. they will have <emphasis>both</emphasis> the old
        and the new copies.
      </para>
      <para>
        You <emphasis>must</emphasis> commit a folder rename before
        changing any of the files inside the folder, otherwise your
        working copy can get really messed up.
      </para>
    </caution>
    <para>
      Another way of moving or copying files is to use the Windows copy/cut
      commands. Select the files you want to copy, right click and choose
      <menuchoice>
        <guimenu>Context Menu</guimenu>
        <guimenuitem>Copy</guimenuitem>
      </menuchoice>
      from the explorer context menu. Then browse to the target folder,
      right click and choose
      <menuchoice>
        <guimenu>TortoiseSVN</guimenu>
        <guimenuitem>Paste</guimenuitem>
      </menuchoice>.
      For moving files, choose
      <menuchoice>
        <guimenu>Context Menu</guimenu>
        <guimenuitem>Cut</guimenuitem>
      </menuchoice>
      instead of
      <menuchoice>
        <guimenu>Context Menu</guimenu>
        <guimenuitem>Copy</guimenuitem>
      </menuchoice>.
    </para>
    <para>
      You can also use the repository browser to move items around.
      Read <xref linkend="tsvn-dug-repobrowser"/> to find out more.
    </para>
    <caution>
      <title>Do Not SVN Move Externals</title>
      <para>
        You should <emphasis>not</emphasis> use the TortoiseSVN
        <guilabel>Move</guilabel> or <guilabel>Rename</guilabel>
        commands on a folder which has been created using
        <literal>svn:externals</literal>.
        This action would cause the external item to be deleted from
        its parent repository, probably upsetting many other people.
        If you need to move an externals folder you should use an
        ordinary shell move, then adjust the
        <literal>svn:externals</literal> properties of the source
        and destination parent folders.
      </para>
    </caution>
  </sect2>
  <sect2 id="tsvn-dug-rename-case-conflict">
    <title>Dealing with filename case conflicts</title>
    <para>
      If the repository already contains two files with the same name
      but differing only in case (e.g. <filename>TEST.TXT</filename>
      and <filename>test.txt</filename>), you
      will not be able to update or checkout the parent directory
      on a Windows client. Whilst Subversion supports case-sensitive
      filenames, Windows does not.
    </para>
    <para>
      This sometimes happens when two people commit, from separate
      working copies, files which happen to have
      the same name, but with a case difference. It can also happen
      when files are committed from a system with a case-sensitive
      file system, like Linux.
    </para>
    <para>
      In that case, you have to decide which one of them you want to
      keep and delete (or rename) the other one from the repository.
    </para>
    <tip>
      <title>Preventing two files with the same name</title>
      <para>
        There is a server hook script available at:
        <ulink url="https://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/">
          <citetitle>https://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/</citetitle>
        </ulink>
        that will prevent checkins which result in case conflicts.
      </para>
    </tip>
  </sect2>
  <sect2 id="tsvn-dug-rename-repair">
    <title>Repairing File Renames</title>
    <para>
      Sometimes your friendly IDE will rename files for you as part of a refactoring
      exercise, and of course it doesn't tell Subversion. If you try to commit your
      changes, Subversion will see the old filename as missing and the new one as
      an unversioned file. You could just check the new filename to get it added in,
      but you would then lose the history tracing, as Subversion does not know the
      files are related.
    </para>
    <para>
      A better way is to notify Subversion that this change is actually a rename,
      and you can do this within the <guilabel>Commit</guilabel> and
      <guilabel>Check for Modifications</guilabel> dialogs.
      Simply select both the old name (missing) and the new name (unversioned)
      and use
      <menuchoice>
        <guimenu>Context Menu</guimenu>
        <guimenuitem>Repair Move</guimenuitem>
      </menuchoice>
      to pair the two files as a rename.
    </para>
  </sect2>
  <sect2 id="tsvn-dug-rename-del-unversioned">
    <title>Deleting Unversioned Files</title>
    <?dbhh topicname="HIDD_DELUNVERSIONED"?>
    <para>
      Usually you set your ignore list such that all generated files are ignored
      in Subversion. But what if you want to clear all those ignored items to produce
      a clean build? Usually you would set that in your makefile, but if you are
      debugging the makefile, or changing the build system it is useful to have a way
      of clearing the decks.
    </para>
    <para>
      TortoiseSVN provides just such an option using
      <menuchoice>
        <guimenu>Extended Context Menu</guimenu>
        <guimenuitem>Delete unversioned items...</guimenuitem>
      </menuchoice>.
      You have to hold the <keycap>Shift</keycap> while right clicking on a folder
      in the explorer list pane (right pane) in order to see this in the extended
      context menu.
      This will produce a dialog which lists all unversioned files anywhere in your
      working copy. You can then select or deselect items to be removed.
    </para>
    <para>
      When such items are deleted, the recycle bin is used, so if you make a mistake
      here and delete a file that should have been versioned, you can still recover it.
    </para>
  </sect2>
</sect1>
