annotate help/a-20.html @ 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 21aa41b62c3a
children
rev   line source
Chris@496 1 <link rel="stylesheet" type="text/css" href="help.css"/>
Chris@496 2
Chris@496 3
Chris@496 4 <h2>I've added a new file: what do I do with it?</h2>
Chris@496 5
Chris@496 6 <p>When you add a new file in the working folder, you normally want to
Chris@496 7 ensure that Mercurial keeps track of changes to that file &ndash; and that
Chris@496 8 the file is included in all copies of the repository. To do this, you
Chris@496 9 need to tell Mercurial to <i>track</i> the file by adding it to version
Chris@496 10 control.</p>
Chris@496 11
Chris@496 12 <p>EasyMercurial shows files that have been created but not added in the
Chris@497 13 <b>&ldquo;Untracked&rdquo;</b> file list under &ldquo;My work&rdquo;. (If your file is not listed
Chris@496 14 there, try clicking the Refresh button.)</p>
Chris@496 15
Chris@496 16 <p><b>1. Find the file you want to add in the Untracked list and select it</b></p>
Chris@496 17
Chris@496 18 <p><b>2. Click Add in the toolbar on the left of the window</b></p>
Chris@496 19
Chris@496 20 <p>The file will be moved to the <b>&ldquo;Added&rdquo;</b> list. This tells Mercurial to
Chris@496 21 track the file. The next time you commit, the contents of your new
Chris@496 22 file will be recorded as part of that change set.
Chris@496 23 <ul><li>Note: the equivalent Mercurial command for this is <b>hg add</b></li></ul></p>
Chris@496 24
Chris@496 25 <p>Of course, you don't always want to track every file in your working
Chris@496 26 copy. Object files generated by a compiler, output files from tests,
Chris@496 27 etc should often not be included in version control. You can ensure
Chris@496 28 that such files don't show up in the Untracked list by right-clicking
Chris@496 29 on them and choosing <b>&ldquo;Ignore..."</b>.</p>
Chris@496 30