Mailing-List: contact dev-help@commons.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Commons Developers List" <dev@commons.apache.org>
Received-SPF: neutral (athena.apache.org: local policy)
Message-Id: <99DA15C9-BC8E-435C-92A4-ACA7B718309B@apache.org>
From: Torsten Curdt <tcurdt@apache.org>
To: "Commons Developers List" <dev@commons.apache.org>
In-Reply-To: <ded132f10807070340y259c7410j84b87a1bd0323b49@mail.gmail.com>
Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0 (Apple Message framework v926)
Subject: Re: Git + tabs?
Date: Mon, 7 Jul 2008 12:57:11 +0200
References: <31cc37360807060925r4d896df3j417c9bf8d4bf6f97@mail.gmail.com>
 <ded132f10807070340y259c7410j84b87a1bd0323b49@mail.gmail.com>


On Jul 7, 2008, at 12:40, Christian Grobmeier wrote:

>>
>>
>> The compress codebase is full of tabs. If I go ahead and detab  
>> things,
>> will that map happily over to your git tree? I don't want to make it
>> too painful for you to produce a patch that can come back.
>>
>
> I just reckoned that we didn't start to work against the svn codebase.
> Instead of that we build the project from scrach, merging all  
> necessary
> code into the GIT repos. I guess i have to merge everything manually.
> If the policy is to use spaces instead of tabs, go ahead.
> I will change that in the GIT repos too and hope that the merge  
> isn't too
> heavy :-)

Guys, hold your horse :)

The PMC has voted and we will merge everything back to SVN. Whoever  
still wants to use git may still use git-svn of course.

I reckon we start polishing there.

But right now I am struggling with git to preserve to import it into  
svn preserving the commits history. :-(

What I've tried:

  git-svn clone https://svn.apache.org/repos/asf/commons/sandbox/compress/branches/redesign 
  --revision 674375
  git-svn rebase

  Added to the .git/config:

   [remote "tcurdt"]
	url = git://vafer.org/compress.git
	fetch = +refs/heads/*:refs/remotes/origin/*

   [branch "tcurdt"]
	remote = tcurdt
	merge = refs/heads/master

Pull in the commits:

  git pull --rebase tcurdt master

Rewrite the log messages:

  git filter-branch -f --msg-filter 'cat; if [ "$GIT_AUTHOR_NAME" =  
"Chris" ]; then echo; echo "Author: Christian Grobmeier (grobmeier@gmail.com 
)"; fi;'
  git filter-branch -f --msg-filter 'cat; if [ "$GIT_AUTHOR_NAME" =  
"Cy" ]; then echo; echo "Author: Christian Grobmeier (grobmeier@gmail.com 
)"; fi;'

Commit to subversion:

  git svn dcommit

Unfortunately the commit fails for me. And even "git-svn rebase" does  
no longer work at that stage.

If anyone is more fluent with git - please help.

cheers
--
Torsten

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org