Re: [git-users] Moving a git repository to svn

2016-01-12 Thread Magnus Therning

GaryP writes:

> I have a local git repository.  I also have a bare repository on another
> machine for security.  No one other than me uses either.
>
> For various reasons, I need to attach the work I've done in this local git
> repo onto an existing (remote) svn repository.  My entire working tree will
> hang on the svn tree as a new directory.
>
> When I've done that, I'll need to keep the svn repo updated with with the
> work I continue to do on my local git repository.  I assume that this part
> will simply be "git svn rebase" and "git svn dcommit", etc.
>
> How can I move the contents of my git repo and its history to an svn
> directory?

I can recommend taking a look at subgit[1], especially if you are
planning on doing this git<->svn mirroring long term.

/M

[1]: http://www.subgit.com/

--
Magnus Therning  OpenPGP: 0x927912051716CE39
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe   http://therning.org/magnus

A system is composed of components: a component is something you
understand.
 -- Professor Howard Aiken

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


signature.asc
Description: PGP signature


Re: [git-users] Moving a git repository to svn

2016-01-11 Thread Gary Pajer
On Mon, Jan 11, 2016 at 1:51 PM, Konstantin Khomoutov <
flatw...@users.sourceforge.net> wrote:

> On Mon, 11 Jan 2016 10:24:23 -0800 (PST)
> GaryP  wrote:
>
> > I have a local git repository.  I also have a bare repository on
> > another machine for security.  No one other than me uses either.
> >
> > For various reasons, I need to attach the work I've done in this
> > local git repo onto an existing (remote) svn repository.  My entire
> > working tree will hang on the svn tree as a new directory.
> >
> > When I've done that, I'll need to keep the svn repo updated with with
> > the work I continue to do on my local git repository.  I assume that
> > this part will simply be "git svn rebase" and "git svn dcommit", etc.
> >
> > How can I move the contents of my git repo and its history to an svn
> > directory?
>
> I suspect you have to do this backwards.
>
> The "problem" is that `git svn` shim (note that Git itself does not
> have the `svn` subcommand; it's implemented by a special program)
> requires special preparations in order to work with the tagret
> Subversion repository.  This means bringing the history of that
> repository down -- converting it to a graph or Git commits, and creating
> special local configuration entries.
>
> So I'd roll it this way:
>
> 1) Prepare your Git repository to work with your Subversion repository.
>
> 2) Just `git svn dcommit` your pile of changes to whatever branch you
>want them to appear on.
>
> The first step might require a set of tries until you get it absolutely
> correct so I'd recomment to train on empty from-scratch repos first.
>

This appears to have worked, thank you.  I haven't looked in great detail,
but it seems to have done the right thing.

Outline:
1.)  create new git-svn remote tracking branch and local tracking branch.
2.) checkout the tracking branch
3.) merge:"git  merge  --strategy-option  theirs  my_local_git_branch
4.) fix one problem:  there was a file deleted in HEAD but modified in
revision
 git rm the_offending.file
5.) git commit
6.) git svn dcommit

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[git-users] Moving a git repository to svn

2016-01-11 Thread GaryP
I have a local git repository.  I also have a bare repository on another 
machine for security.  No one other than me uses either.

For various reasons, I need to attach the work I've done in this local git 
repo onto an existing (remote) svn repository.  My entire working tree will 
hang on the svn tree as a new directory.

When I've done that, I'll need to keep the svn repo updated with with the 
work I continue to do on my local git repository.  I assume that this part 
will simply be "git svn rebase" and "git svn dcommit", etc.

How can I move the contents of my git repo and its history to an svn 
directory?

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] Moving a git repository to svn

2016-01-11 Thread Konstantin Khomoutov
On Mon, 11 Jan 2016 10:24:23 -0800 (PST)
GaryP  wrote:

> I have a local git repository.  I also have a bare repository on
> another machine for security.  No one other than me uses either.
> 
> For various reasons, I need to attach the work I've done in this
> local git repo onto an existing (remote) svn repository.  My entire
> working tree will hang on the svn tree as a new directory.
> 
> When I've done that, I'll need to keep the svn repo updated with with
> the work I continue to do on my local git repository.  I assume that
> this part will simply be "git svn rebase" and "git svn dcommit", etc.
> 
> How can I move the contents of my git repo and its history to an svn 
> directory?

I suspect you have to do this backwards.

The "problem" is that `git svn` shim (note that Git itself does not
have the `svn` subcommand; it's implemented by a special program)
requires special preparations in order to work with the tagret
Subversion repository.  This means bringing the history of that
repository down -- converting it to a graph or Git commits, and creating
special local configuration entries.

So I'd roll it this way:

1) Prepare your Git repository to work with your Subversion repository.

2) Just `git svn dcommit` your pile of changes to whatever branch you
   want them to appear on.

The first step might require a set of tries until you get it absolutely
correct so I'd recomment to train on empty from-scratch repos first.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: [git-users] Moving to GIT

2015-03-12 Thread Philip Oakley
- Original Message - 
  From: William Lasiewicz 
  To: git-users@googlegroups.com 
  Sent: Thursday, March 12, 2015 8:24 PM
  Subject: [git-users] Moving to GIT


  We ran out of perforce licenses and some developers set up GIT.  We now have 
GIT and Perforce.
  We are considering moving to GIT.


  Here is what I have seen,  but perhaps I am doing something wrong.  


  1.  Set up a new repository.
  2.  Add a bunch of files.
  3.  Commit,  push.
  4.  Delete your local files.

  Your code is now gone.  All the push commit did is update a text file on the 
server.

  Is this tool that horrible,  or did I do something wrong?

The tool uses a different mindset, so there will be misunderstandings and 
'gotchas' while you get you head around where the benefits are.

Obviously, you deleted your files, so they are 'gone' in that steps 2  3 
sneaked off with copies, compressed them up and hid them in both your local 
repo (the commit step), and in the remote repo (the push step). However they 
are still there ready for recovery. The repos are (typically) in the  hidden 
.git directory.

Have a read of the git-scm on-line book (http://git-scm.com/book/en/v2) as one 
on many about Git. 

You can still checkout your branch / commit, or reset to your commit.

I find the 'gitk' repository viewer helpful, and the 'git gui' to assist in 
viewing the current repo status (especially if you like graphic gui's)

Philip

You should be able to checkout the last commit

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


[git-users] Moving to git

2012-07-01 Thread David MZ
Hello, I want to drive a move to git in my company that is currently using 
SVN, I was wondering if there are presentations that were already created 
that can show the benefits of git over SVN. I would lke to win hearts of 
stockholders and begin a moment already 60% of Dev team using git-svn in 
the company.

Thanks.

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/5GnWJe09OGkJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.