annotate help/topics/22.txt @ 532:06507a59f2b8 easyhg_v1.1

This will do for the Merge topic
author Chris Cannam
date Wed, 23 Nov 2011 17:24:47 +0000
parents a9032181c37d
children
rev   line source
Chris@496 1 {Making changes}
Chris@496 2
Chris@497 3 I want to remove, rename, or copy a file
Chris@496 4
Chris@497 5 To remove or rename a file, you first need to find it in the list of
Chris@497 6 files under "My work". This area normally shows only those files that
Chris@497 7 you have changed since your last commit: if it isn't one of those,
Chris@497 8 toggle the "Show all files" option at the bottom of the window.
Chris@496 9
Chris@497 10 To *remove* a file from version control so that changes to it are no longer tracked:
Chris@496 11
Chris@497 12 *1. Select the file you want to remove in the list of files under "My work".*
Chris@496 13
Chris@497 14 *2. Click Remove in the toolbar on the left of the window*
Chris@496 15
Chris@497 16 The file will be moved to the *"Removed"* list. This tells Mercurial
Chris@497 17 to stop tracking the file the next time you commit. The file itself
Chris@497 18 is not removed from the disc: you will need to do that using your
Chris@497 19 system file manager afterwards.
Chris@497 20
Chris@497 21 * Note: the equivalent Mercurial command for this is *hg remove -Af*
Chris@497 22
Chris@497 23 To *rename* or *copy* a file:
Chris@497 24
Chris@497 25 *1. Select the file you want to remove in the list of files under "My work".*
Chris@497 26
Chris@497 27 *2. Right-click and select "Rename..." or "Copy..." on the context menu*
Chris@497 28
Chris@497 29 *3. Enter a new name for the file.*
Chris@497 30
Chris@497 31 * Note: the equivalent Mercurial commands are *hg rename* and *hg copy*
Chris@497 32
Chris@497 33
Chris@497 34