[Buildd-tools-devel] Merging of buildd and sbuild repositories

[Roger Leigh]

Dear all,

Today, I merged the sbuild.git and buildd.git repositories together,
because buildd is going to need to start using and sharing code with
the sbuild perl modules.

** This means that all future buildd work needs to be done in the sbuild
** repository.

This means we can now fix up wanna-build, buildd and all the tools and
add them to the sbuild packaging (as separate packages).


In case you're interested how git can merge two unrelated repos,
preserving all history from both, here's how it was done:

# Clone sbuild repo
git clone git://git.debian.org/git/buildd-tools/sbuild.git
cd sbuild

# Import the master (actually, only) branch in buildd.git to a new
# buildd branch in our local sbuild repo
git fetch git://git.debian.org/git/buildd-tools/buildd.git master:buildd
# Switch to buildd branch
git checkout buildd
# Branch again to create a scratch branch for working on, then switch
# to it
git branch buildd-cleanup
git checkout buildd-cleanup

# Now reorganise tree in preparation for merge to ensure no conflicts
[reorg]
git commit

# Now switch back to master branch
git checkout master
# Merge our buildd-cleanup branch
git merge -m "Merge buildd history" buildd-cleanup
[Fix a single conflict in .gitignore]
git add .gitignore
# Commit merge
git commit

# Push all of the above to the git.debian.org repo
git push origin master


Regards,
Roger

-- 
  .''`.  Roger Leigh
 : :' :  Debian GNU/Linux             http://people.debian.org/~rleigh/
 `. `'   Printing on GNU/Linux?       http://gutenprint.sourceforge.net/
   `-    GPG Public Key: 0x25BFB848   Please GPG sign your mail.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/buildd-tools-devel/attachments/20080106/98025b62/attachment.pgp