Permalink
Browse files

some doc cleanups

  • Loading branch information...
1 parent 04e3f33 commit 3e9319f17b894e215662150568decd5ead62f637 @rfk committed Oct 4, 2011
Showing with 18 additions and 10 deletions.
  1. +9 −5 README.rst
  2. +9 −5 git_remote_hg/__init__.py
View
@@ -22,6 +22,9 @@ with mercurial. Install it and you can do::
$ git commit -a
$ git push
+Tada! Your commits from git will show up in the remote mercurial repo, and
+none of your co-workers will be any the wiser.
+
All the hard work of interoperating between git and mercurial is done by the
awesome hg-git module. All the hard work of speaking the git-remote-helper
protocol is done by git's own http-protol handlers. This script just hacks
@@ -33,23 +36,24 @@ repositories hidden inside your local git repo:
* .git/hgremotes/[URL]: a local hg clone of the remote repo
* .git/hgremotes/[URL]/.hg/git: a bare git repo managed by hg-git
-Pushing from your local git repo into the remote mercurial repo goes like
-this:
+When you "git push" from your local git repo into the remote mercurial repo,
+here is what git-remote-hg will do for you:
* use git-remote-http to push into .git/hgremotes/[URL]/.hg/git
* call "hg gimport" to import changes into .git/hgremotes/[URL]
* call "hg push" to push them up to the remote repo
-Likewise, pulling from the remote mercurial repo goes like this:
+Likewise, when you "git pull" from the remote mercurial repo into your local
+git repo, here is what happens under the hood:
* call "hg pull" to pull changes from the remote repo
* call "hg gexport" to export them into .git/hgremotes/[URL]/.hg/git
* use git-remote-http to pull them into your local repo
Ugly? Sure. Hacky? You bet. But it seems to work remarkably well.
-There is apparently a native implementation of a git-remote-hg command in
-development:
+By the way, there is apparently a native implementation of a git-remote-hg
+command in development:
https://plus.google.com/115991361267198418069/posts/Jpzi24bYU91
View
@@ -22,6 +22,9 @@
$ git commit -a
$ git push
+Tada! Your commits from git will show up in the remote mercurial repo, and
+none of your co-workers will be any the wiser.
+
All the hard work of interoperating between git and mercurial is done by the
awesome hg-git module. All the hard work of speaking the git-remote-helper
protocol is done by git's own http-protol handlers. This script just hacks
@@ -33,23 +36,24 @@
* .git/hgremotes/[URL]: a local hg clone of the remote repo
* .git/hgremotes/[URL]/.hg/git: a bare git repo managed by hg-git
-Pushing from your local git repo into the remote mercurial repo goes like
-this:
+When you "git push" from your local git repo into the remote mercurial repo,
+here is what git-remote-hg will do for you:
* use git-remote-http to push into .git/hgremotes/[URL]/.hg/git
* call "hg gimport" to import changes into .git/hgremotes/[URL]
* call "hg push" to push them up to the remote repo
-Likewise, pulling from the remote mercurial repo goes like this:
+Likewise, when you "git pull" from the remote mercurial repo into your local
+git repo, here is what happens under the hood:
* call "hg pull" to pull changes from the remote repo
* call "hg gexport" to export them into .git/hgremotes/[URL]/.hg/git
* use git-remote-http to pull them into your local repo
Ugly? Sure. Hacky? You bet. But it seems to work remarkably well.
-There is apparently a native implementation of a git-remote-hg command in
-development:
+By the way, there is apparently a native implementation of a git-remote-hg
+command in development:
https://plus.google.com/115991361267198418069/posts/Jpzi24bYU91

0 comments on commit 3e9319f

Please sign in to comment.