comparison README @ 304:ce676eff002b

First merge, totally untested.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Fri, 01 May 2009 10:28:59 +0200
parents 982c46e7d167
children dbdcb97b38af
comparison
equal deleted inserted replaced
303:f423a8780832 304:ce676eff002b
1 -*-restructuredtext-*- 1 .. -*-restructuredtext-*-
2 2
3 ============ 3 ============
4 hgsubversion 4 hgsubversion
5 ============ 5 ============
6 6
12 internals of Mercurial and/or Subversion. 12 internals of Mercurial and/or Subversion.
13 13
14 Installation 14 Installation
15 ------------ 15 ------------
16 You need to have Subversion installed with the SWIG Python bindings 16 You need to have Subversion installed with the SWIG Python bindings
17 from Subversion 1.5 or later. You need Mercurial 1.1.1 or later. 17 from Subversion 1.5 or later. You need Mercurial 1.3 (currently in development)
18 or later.
18 19
19 .. _mercurial: http://selenic.com/repo/hg 20 .. _mercurial: http://selenic.com/repo/hg
20 .. _mercurial-stable: http://selenic.com/repo/hg-stable 21 .. _mercurial-stable: http://selenic.com/repo/hg-stable
21 .. _crew: http://hg.intevation.org/mercurial/crew 22 .. _crew: http://hg.intevation.org/mercurial/crew
22 .. _crew-stable: http://hg.intevation.org/mercurial/crew-stable 23 .. _crew-stable: http://hg.intevation.org/mercurial/crew-stable
40 41
41 Basic Use 42 Basic Use
42 ----------- 43 -----------
43 Get a new clone of an svn server:: 44 Get a new clone of an svn server::
44 45
45 $ hg svnclone <svn URI> [destination] 46 $ hg clone <svn URI> [destination]
46 47
47 Real example:: 48 Real example::
48 49
49 $ hg svnclone http://python-nose.googlecode.com/svn nose-hg 50 $ hg clone svn+http://python-nose.googlecode.com/svn nose-hg
50 51
51 Note, you should pull from the root subversion directory, not specific 52 Note, you should pull from the root subversion directory, not specific
52 folders (such as trunk). 53 folders (such as trunk). Also, you only need to modify http:// urls as shown.
54 This is a side effect of Mercurial and Subversion both claiming the http
55 protocol, so svn+http is used to work around that.
53 56
54 Pull new revisions into an already-converted repo:: 57 Pull new revisions into an already-converted repo::
55 58
56 $ hg svn pull 59 $ hg pull
57 60
58 For more information, see ``hg help svn`` while in a converted repo. 61 For more information, see ``hg help svn`` while in a converted repo.
59 62
60 Support for ``svn:externals`` 63 Support for ``svn:externals``
61 ----------------------------- 64 -----------------------------