Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: pass (nike.apache.org: domain of adam.kocoloski@gmail.com
 designates 74.125.46.30 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:from:to:content-type:content-transfer-encoding
         :mime-version:subject:date:x-mailer;
        b=APX4yHjUrsDYaTTtNQ+aHNhdg2U85otHcWEGDyHLtwu3SVzl5ZGB5ucB4Y9LWCA1g4
         I/knV93bfuVtZehNPw4J5FTmeC3MvZ6B8qEknlIqFRb5NNJMrTArNRJidvW3IHmyGfii
         2Q700rUyAfDWYASM80UNyMhUYWb2IBdr7GfUM=
Message-Id: <C38145B0-F7DF-4A60-8F9D-1F2FD33B781E@gmail.com>
From: Adam Kocoloski <adam.kocoloski@gmail.com>
To: dev@couchdb.apache.org
Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0 (Apple Message framework v930.3)
Subject: merging the new github master into an old branch
Date: Tue, 6 Jan 2009 09:28:12 -0500

Hi, I have a few topic branches that I forked off of the old git-svn  
repo run by Jim Lindley on GitHub.  I'd like to keep these branches up- 
to-date with trunk, but this is complicated slightly by the fact that  
the preferred git mirror for CouchDB is now the one run by Tim Carey- 
Smith (halorgium), which has a different working tree structure than  
jlindley's old one.  Here's what I did, hopefully someone else finds  
it useful.  All commands are executed with the topic branch checked  
out ...

1) Reorganize the topic branch's working tree to look like halorgium's  
master:

git rm -r branches site supplement tags vendor
git commit -m "don't include SVN branches, tags, etc. in working tree"
git mv trunk/* .
rmdir trunk
git commit -m "move trunk contents to root"

2) Find the latest SVN commit that shows up in the new master and my  
topic branch.  The git objects corresponding to that SVN commit will  
be different.  Merge that commit from master into the branch:

git merge d9a5ce0955f28373eeeab9537a37bc549f3da013

3) Step 2 almost certainly required some manual conflict resolution,  
but hopefully we minimized it by choosing the latest common SVN  
commit.  Now we can merge all the newer changes in trunk.  I tried  
doing this with a git-rebase, but rebase didn't know how to handle the  
step where I moved trunk's contents into the working tree, so:

git merge master

I'm not a git pro by any means, so I'd be happy to hear if there are  
other, better ways of handling this. Best, Adam