Mercurial > hg > mercurial-crew-with-dirclash
comparison README @ 1308:2073e5a71008
Cleanup of tabs and trailing spaces.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 21 Sep 2005 07:56:19 +0200 |
parents | 4f81068ed8cd |
children | d242719c716e |
comparison
equal
deleted
inserted
replaced
1285:1546c2aa6b30 | 1308:2073e5a71008 |
---|---|
61 Faster: | 61 Faster: |
62 $ patch < ../p/foo.patch | 62 $ patch < ../p/foo.patch |
63 $ hg commit `lsdiff -p1 ../p/foo.patch` | 63 $ hg commit `lsdiff -p1 ../p/foo.patch` |
64 | 64 |
65 Fastest: | 65 Fastest: |
66 $ cat ../p/patchlist | xargs hg import -p1 -b ../p | 66 $ cat ../p/patchlist | xargs hg import -p1 -b ../p |
67 | 67 |
68 Exporting a patch: | 68 Exporting a patch: |
69 | 69 |
70 (make changes) | 70 (make changes) |
71 $ hg commit | 71 $ hg commit |
74 $ hg export 28237 > foo.patch # export changeset 28237 | 74 $ hg export 28237 > foo.patch # export changeset 28237 |
75 | 75 |
76 Network support: | 76 Network support: |
77 | 77 |
78 # pull from the primary Mercurial repo | 78 # pull from the primary Mercurial repo |
79 foo$ hg clone http://selenic.com/hg/ | 79 foo$ hg clone http://selenic.com/hg/ |
80 foo$ cd hg | 80 foo$ cd hg |
81 | 81 |
82 # export your current repo via HTTP with browsable interface | 82 # export your current repo via HTTP with browsable interface |
83 foo$ hg serve -n "My repo" -p 80 | 83 foo$ hg serve -n "My repo" -p 80 |
84 | 84 |
85 # pushing changes to a remote repo with SSH | 85 # pushing changes to a remote repo with SSH |
86 foo$ hg push ssh://user@example.com/~/hg/ | 86 foo$ hg push ssh://user@example.com/~/hg/ |
87 | 87 |
88 # merge changes from a remote machine | 88 # merge changes from a remote machine |
89 bar$ hg pull http://foo/ | 89 bar$ hg pull http://foo/ |