git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] Documentation/git-svn.txt: Fix "git clone" example
@ 2008-02-06 23:45 Peter Harris
  2008-02-07 14:34 ` Karl Hasselström
  0 siblings, 1 reply; 4+ messages in thread
From: Peter Harris @ 2008-02-06 23:45 UTC (permalink / raw)
  To: git


If you don't "git reset --hard" to create master, then the "git svn rebase"
step fails.

Also add "-s" to use a satandard layout, and remove the bogus '=' from
the "git config" step.

Signed-off-by: Peter <git@peter.is-a-geek.org>
---
 Documentation/git-svn.txt |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index f94d0f9..b293a66 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -455,16 +455,18 @@ have each person clone that repository with 'git clone':
 
 ------------------------------------------------------------------------
 # Do the initial import on a server
-	ssh server "cd /pub && git svn clone http://svn.foo.org/project
+	ssh server "cd /pub && git svn clone -s http://svn.foo.org/project
 # Clone locally - make sure the refs/remotes/ space matches the server
 	mkdir project
 	cd project
 	git init
 	git remote add origin server:/pub/project
-	git config --add remote.origin.fetch=+refs/remotes/*:refs/remotes/*
+	git config --add remote.origin.fetch +refs/remotes/*:refs/remotes/*
 	git fetch
 # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server)
-	git svn init http://svn.foo.org/project
+	git svn init -s http://svn.foo.org/project
+# Check out the svn branch you want to work on
+	git reset --hard trunk
 # Pull the latest changes from Subversion
 	git svn rebase
 ------------------------------------------------------------------------
-- 
1.5.3.7

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] Documentation/git-svn.txt: Fix "git clone" example
  2008-02-06 23:45 [PATCH 2/2] Documentation/git-svn.txt: Fix "git clone" example Peter Harris
@ 2008-02-07 14:34 ` Karl Hasselström
  2008-02-07 14:52   ` Peter Harris
  0 siblings, 1 reply; 4+ messages in thread
From: Karl Hasselström @ 2008-02-07 14:34 UTC (permalink / raw)
  To: Peter Harris; +Cc: git

On 2008-02-06 18:45:03 -0500, Peter Harris wrote:

> satandard layout

Non-satandard spelling.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] Documentation/git-svn.txt: Fix "git clone" example
  2008-02-07 14:34 ` Karl Hasselström
@ 2008-02-07 14:52   ` Peter Harris
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Harris @ 2008-02-07 14:52 UTC (permalink / raw)
  To: Karl Hasselström; +Cc: git

On Feb 7, 2008 9:34 AM, Karl Hasselström <kha@treskal.com> wrote:
> On 2008-02-06 18:45:03 -0500, Peter Harris wrote:
> > satandard layout
>
> Non-satandard spelling.

Oh, the embarrassment.

An email with corrected spelling is on its way.

Peter Harris

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/2] Documentation/git-svn.txt: Fix "git clone" example
@ 2008-02-07 14:52 Peter Harris
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Harris @ 2008-02-07 14:52 UTC (permalink / raw)
  To: git

Subject: [PATCH] Documentation/git-svn.txt: Fix "git clone" example

If you don't "git reset --hard" to create master, then the "git svn rebase"
step fails.

Also add "-s" to use a standard layout, and remove the bogus '=' from
the "git config" step.

Signed-off-by: Peter <git@peter.is-a-geek.org>
---

This time with a correctly spelled log message.

 Documentation/git-svn.txt |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index f94d0f9..b293a66 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -455,16 +455,18 @@ have each person clone that repository with 'git clone':
 
 ------------------------------------------------------------------------
 # Do the initial import on a server
-	ssh server "cd /pub && git svn clone http://svn.foo.org/project
+	ssh server "cd /pub && git svn clone -s http://svn.foo.org/project
 # Clone locally - make sure the refs/remotes/ space matches the server
 	mkdir project
 	cd project
 	git init
 	git remote add origin server:/pub/project
-	git config --add remote.origin.fetch=+refs/remotes/*:refs/remotes/*
+	git config --add remote.origin.fetch +refs/remotes/*:refs/remotes/*
 	git fetch
 # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server)
-	git svn init http://svn.foo.org/project
+	git svn init -s http://svn.foo.org/project
+# Check out the svn branch you want to work on
+	git reset --hard trunk
 # Pull the latest changes from Subversion
 	git svn rebase
 ------------------------------------------------------------------------
-- 
1.5.3.7

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2008-02-07 14:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-06 23:45 [PATCH 2/2] Documentation/git-svn.txt: Fix "git clone" example Peter Harris
2008-02-07 14:34 ` Karl Hasselström
2008-02-07 14:52   ` Peter Harris
  -- strict thread matches above, loose matches on Subject: below --
2008-02-07 14:52 Peter Harris

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).