• 
      

    Fix git-svn (and git-perforce) with parent diffs.

    Review Request #5628 — Created March 15, 2014 and submitted

    Information

    RBTools
    master
    3ca62a7...

    Reviewers

    There were a few bugs making it impossible to use --parent with git-svn and
    git-perforce checkouts. The first of which is that the make_*_diff methods
    needed to have access to the merge base, rather than the base of the individual
    diff. I've plumbed this through so that we can properly determine the upstream
    revision to include in the diff headers.

    The other problem was that the git-svn code was mistakenly using --parent to
    mean the upstream branch rather than --tracking-branch.

    Posted changes with a git-svn checkout, both for a single branch off of master,
    as well as using --parent to post a change with un-committed parent revisions.

    WJ
    1. Tested the proposed changes out with my rb instance (1.7.22), and it WFM!

      Seems to be giving reasonable results when called through rbt diff as well.

    2. 
        
    chipx86
    1. Ship It!

    2. 
        
    david
    Review request changed
    Status:
    Completed
    Change Summary:
    Pushed to master (59728bd).