annotate help/topics/32.txt @ 519:000f13faa089
Bookmarks are now displayed -- but exactly like tags, so far, there's no differentiation yet
author |
Chris Cannam |
date |
Tue, 08 Nov 2011 16:42:09 +0000 |
parents |
b3309be1640f |
children |
|
rev |
line source |
Chris@498
|
1 {Sharing changes}
|
Chris@498
|
2
|
Chris@499
|
3 I want to put my changes into a master repository shared with my colleagues
|
Chris@498
|
4
|
Chris@499
|
5 Setting up such a repository with a properly configured remote server
|
Chris@499
|
6 is out of the scope of this Help, but you generally want one of the
|
Chris@499
|
7 following:
|
Chris@499
|
8
|
Chris@499
|
9 *A server that everyone on your team has secure ssh access to*, _or_
|
Chris@499
|
10
|
Chris@499
|
11 *An account with a managed online Mercurial hosting service*
|
Chris@499
|
12
|
Chris@499
|
13 With either of the above, you should be able to create a new
|
Chris@499
|
14 repository on the server and obtain a Mercurial URL for it. That may
|
Chris@499
|
15 be a _ssh://host/path_ URL in the former case, or the URL (often an
|
Chris@499
|
16 _https_ one) provided by the service in the latter case.
|
Chris@499
|
17
|
Chris@499
|
18 In EasyMercurial, you then:
|
Chris@499
|
19
|
Chris@499
|
20 *1. Go to Remote -> Set Remote Location.., enter the URL of the remote repository and click OK.*
|
Chris@499
|
21
|
Chris@499
|
22 * This tells EasyMercurial to use that URL as the default location for subsequent push and pull operations.
|
Chris@499
|
23
|
Chris@499
|
24 *2. Click Push on the main toolbar at the top of the EasyMercurial window.*
|
Chris@499
|
25
|
Chris@499
|
26 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.
|
Chris@499
|
31
|
Chris@499
|
32 For this to work, the target repository must be _related_ 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.
|
Chris@499
|
37
|