threads / patch / 16243

patchDocumentation: git-svn: fix example for centralized SVN clone

Subject: [PATCH] Documentation: git-svn: fix example for centralized SVN clone

## tl;dr

2 messages between Nov 9, 2008 and Nov 10, 2008. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Jan Krüger· Nov 9, 2008, 22:00 UTC · lore

The example that tells users how to centralize the effort of the initial git svn clone operation doesn't work properly. It uses rebase but that only works if HEAD exists. This adds one extra command to create a somewhat sensible HEAD that should work in all cases.

Signed-off-by: Jan Krüger <jk@jk.gs>
---
I have a feeling this looks a bit ugly, but I can't think of a simpler
solution (especially since we're not fetching the central repo's HEAD).
Still, it's certainly better than a broken example.

 Documentation/git-svn.txt |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Show changes to Documentation/git-svn.txt +2 −1

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 84c8f3c..ba94cd1 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -544,6 +544,8 @@ have each person clone that repository with 'git-clone':
        git remote add origin server:/pub/project
        git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
        git fetch
+# Create a local branch from one of the branches just fetched
+       git checkout -b master FETCH_HEAD
 # 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.example.com/project
 # Pull the latest changes from Subversion
--
1.6.0.3.578.g6a50

Eric Wong· Nov 10, 2008, 01:12 UTC · re: Jan Krüger · lore

Re: [PATCH] Documentation: git-svn: fix example for centralized SVN clone

Jan Krüger <jk@jk.gs> wrote:

Show 10 quoted lines

> The example that tells users how to centralize the effort of the initial
> git svn clone operation doesn't work properly. It uses rebase but that
> only works if HEAD exists. This adds one extra command to create a
> somewhat sensible HEAD that should work in all cases.
> 
> Signed-off-by: Jan Krüger <jk@jk.gs>
> ---
> I have a feeling this looks a bit ugly, but I can't think of a simpler
> solution (especially since we're not fetching the central repo's HEAD).
> Still, it's certainly better than a broken example.

*shrug*  Seems alright with me.

Adam wrote the original example, maybe he knows better.

Show 18 quoted lines

>  Documentation/git-svn.txt |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
> index 84c8f3c..ba94cd1 100644
> --- a/Documentation/git-svn.txt
> +++ b/Documentation/git-svn.txt
> @@ -544,6 +544,8 @@ have each person clone that repository with 'git-clone':
>         git remote add origin server:/pub/project
>         git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
>         git fetch
> +# Create a local branch from one of the branches just fetched
> +       git checkout -b master FETCH_HEAD
>  # 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.example.com/project
>  # Pull the latest changes from Subversion
> --
> 1.6.0.3.578.g6a50

-- 
Eric Wong