This repository is private.
All pages are served over SSL and all pushing and pulling is done over SSH.
No one may fork, clone, or view it unless they are added as a member.
Every repository with this icon (
) is private.
Every repository with this icon (
This repository is public.
Anyone may fork, clone, or view it.
Every repository with this icon (
) is public.
Every repository with this icon (
Run the following if you haven't already:
gem sources -a http://gems.github.com
Install the gem(s):
sudo gem install evilchelu-braid
commit 48d8984da2b15538dae1c5bb8e2e19d76a2100b4
tree 167b973c73ff1f3fd228728bd1fe1ee9efc25ce8
parent 40376d431f84e53d02dd2335f5f9cff7590be5eb
tree 167b973c73ff1f3fd228728bd1fe1ee9efc25ce8
parent 40376d431f84e53d02dd2335f5f9cff7590be5eb
braid /
| name | age | message | |
|---|---|---|---|
| |
.gitignore | Tue Feb 05 04:20:20 -0800 2008 | [evilchelu] |
| |
History.txt | Wed Oct 31 09:43:50 -0700 2007 | [evilchelu] |
| |
License.txt | Wed Feb 13 16:21:15 -0800 2008 | [evilchelu] |
| |
Manifest.txt | Tue Apr 29 05:35:18 -0700 2008 | [norbert] |
| |
README.txt | Thu Mar 06 06:18:58 -0800 2008 | [evilchelu] |
| |
Rakefile | Wed Oct 31 09:43:50 -0700 2007 | [evilchelu] |
| |
TODO.txt | Mon Mar 10 12:19:26 -0700 2008 | [evilchelu] |
| |
bin/ | Tue Apr 29 01:52:39 -0700 2008 | [norbert] |
| |
braid.gemspec | Tue Apr 29 07:15:08 -0700 2008 | [evilchelu] |
| |
config/ | Thu Apr 24 18:34:01 -0700 2008 | [evilchelu] |
| |
lib/ | Tue Apr 29 07:15:54 -0700 2008 | [evilchelu] |
| |
log/ | Wed Oct 31 09:43:50 -0700 2007 | [evilchelu] |
| |
script/ | Wed Oct 31 09:43:50 -0700 2007 | [evilchelu] |
| |
setup.rb | Wed Oct 31 09:43:50 -0700 2007 | [evilchelu] |
| |
spec/ | Mon Apr 21 10:32:48 -0700 2008 | [norbert] |
| |
tasks/ | Mon Apr 21 06:12:11 -0700 2008 | [norbert] |
README.txt
= README Braid is a simple tool for managing vendor branches across different SCMs. http://evil.che.lu/projects/braid You'll need a rather recent version of git, most likely something after 1.5.4. If you're on OS X, git from macports is at version 1.5.3.7 and braid won't work with that. There a patch in the macports trac to allow you to get git-core 1.5.4.2, here (thanks jakehow): http://trac.macosforge.org/projects/macports/ticket/13956 = INSTALLING FORM RUBYGEMS # gem not published yet. please install from git sudo gem install braid = INSTALLING FROM GIT # install deps sudo gem install main sudo gem install open4 git clone git://github.com/evilchelu/braid.git cd braid rake install_gem = USAGE # create a git repo git init moo cd moo # ideally you will also do these, but they are just good practices git config --global merge.summary true git checkout -b localwork # adding mirrors braid add git://blah braid add svn://muh gitk braid/track git merge braid/track # updating mirrors braid update muh braid update git merge braid/track # removing mirrors braid remove blah braid remove muh git merge braid/track = MORE USAGE Braid stores it's metadata in a file called ".braids" located in the current directory where braid is run. For full usage docs run: braid help braid help COMMANDNAME = POSSIBLE PROBLEMS In a multiuser setup people won't have all the remote branches setup. But nothing is really lost, yet. Theoretically if you add the same remotes on other checkout and set the branches correctly things could be made to just work(TM). = ISSUES Braid barely works and you'll definitely encounter bugs. Help is appreciated :). For now, known issues and feature requests are stored in the TODO.txt file in the root of the braid checkout.




