Permalink
Switch branches/tags
Nothing to show
Commits on May 31, 2011
  1. remove the rebase flag for now

    termie committed May 31, 2011
Commits on May 8, 2011
  1. Merge pull request #21 from jd/master

    termie committed May 8, 2011
    Use --rebase with pull.
  2. memoize our setup branches step to speed up tests

    termie committed May 8, 2011
    also adds a run_tests.sh that pipes stderr to a log file for cleaner
    test output and a .gitignore to hide the tons of stuff in vendor
Commits on May 2, 2011
  1. added tests against a bunch of versions of bzr

    termie committed May 2, 2011
    tests are much slower now, however, and the initial bzr checkout from
    launchpad took me a ridiculous amount of time (they may have been
    experiencing some degraded performance or something similar)
Commits on Mar 23, 2011
  1. Use rebase when pulling

    jd committed Mar 23, 2011
    Since we need to be a fast-forward when git bzr push'ing, it seems better to
    do the pull with --rebase.
    
    Signed-off-by: Julien Danjou <julien@danjou.info>
Commits on Mar 22, 2011
  1. add tests for git bzr init

    termie committed Mar 22, 2011
    had to remove the feature that inits based on a branch as it didn't
    really seem to work properly, we should always init based on master
    and then pushes will work fine
  2. add test for new import check

    termie committed Mar 22, 2011
  3. Simple validation for import

    jd committed Mar 22, 2011
    Signed-off-by: Julien Danjou <julien@danjou.info>
Commits on Mar 11, 2011
  1. New init subcommand.

    niemeyer committed Mar 11, 2011
Commits on Feb 21, 2011
Commits on Feb 19, 2011
Commits on Jan 31, 2011
  1. updates to readme

    termie committed Jan 31, 2011
Commits on Jan 30, 2011
  1. update readme

    termie committed Jan 30, 2011
  2. moving tests to python

    termie committed Jan 28, 2011
Commits on Aug 21, 2010
  1. sync --overwrite fixes the marks as well

    termie committed Aug 21, 2010
    If you get a branch has diverged error, you can now git sync --overwrite
    followed by git rebase bzr/YOUR_BRANCH
Commits on Aug 19, 2010
  1. Adds a clear command and a --parent_branch option

    termie committed Aug 19, 2010
    Clear is used to help you clear out the data related to bzr in the event
    that you have somehow messed things up.
    
    --parent_branch is a new option to push that allows you to specify which
    branch you want the new branch to be based on it is helpful for
    branching from branches that are not master.
Commits on Aug 18, 2010
  1. Create a no-trees bzr repository instead

    awilkins authored and termie committed Aug 18, 2010
Commits on Jul 27, 2010
  1. Preserve ancestry so that bzr users can merge :)

    termie committed Jul 27, 2010
    For now we always assume we want to branch from master, in the future
    I'd like to be smarter about that
Commits on Jul 26, 2010