annotate help/a-32.html @ 649:35b0a7aa1fc1

Show tag on merge commit (fixing #534)
author Chris Cannam
date Thu, 24 Jan 2013 15:05:40 +0000
parents b3309be1640f
children
rev   line source
Chris@498 1 <link rel="stylesheet" type="text/css" href="help.css"/>
Chris@498 2
Chris@498 3
Chris@499 4 <h2>I want to put my changes into a master repository shared with my colleagues</h2>
Chris@498 5
Chris@499 6 <p>Setting up such a repository with a properly configured remote server
Chris@499 7 is out of the scope of this Help, but you generally want one of the
Chris@499 8 following:</p>
Chris@499 9
Chris@499 10 <p><b>A server that everyone on your team has secure ssh access to</b>, <i>or</i></p>
Chris@499 11
Chris@499 12 <p><b>An account with a managed online Mercurial hosting service</b></p>
Chris@499 13
Chris@499 14 <p>With either of the above, you should be able to create a new
Chris@499 15 repository on the server and obtain a Mercurial URL for it. That may
Chris@499 16 be a <i>ssh://host/path</i> URL in the former case, or the URL (often an
Chris@499 17 <i>https</i> one) provided by the service in the latter case.</p>
Chris@499 18
Chris@499 19 <p>In EasyMercurial, you then:</p>
Chris@499 20
Chris@499 21 <p><b>1. Go to Remote -> Set Remote Location.., enter the URL of the remote repository and click OK.</b>
Chris@499 22 <ul><li>This tells EasyMercurial to use that URL as the default location for subsequent push and pull operations.</li></ul></p>
Chris@499 23
Chris@499 24 <p><b>2. Click Push on the main toolbar at the top of the EasyMercurial window.</b></p>
Chris@499 25
Chris@499 26 <p>This will push all of the changes that you have made in your local
Chris@499 27 repository (since you pushed to the same target, if you ever have).
Chris@499 28 You should do this regularly whenever you have a coherent set of
Chris@499 29 changes for others to use or test. Your colleagues can then pull from
Chris@499 30 the same remote repository URL to obtain your changes.</p>
Chris@499 31
Chris@499 32 <p>For this to work, the target repository must be <i>related</i> to the local
Chris@499 33 one. That means either a repository that has been pulled to, or
Chris@499 34 pushed to from, the local repository before; or the repository that
Chris@499 35 was initially used to clone the local one from; or else an empty
Chris@499 36 repository.</p>
Chris@499 37