Wiki updates that might interest people.

[Alfred Perlstein]

On 11/17/14, 12:48 PM, Ulrich Spörlein wrote:
> 2014-11-17 0:40 GMT+01:00 Alfred Perlstein <bright at mu.org>:
>> Hey folks,
>>
>> I've updated the wiki with better instructions on how to use git-svn and
>> commit to FreeBSD.
>>
>> Right now we are sort of blocked adding new files until
>> https://reviews.freebsd.org/D1154, but until then you can rebuild git with
>> those changes and .... IT WORKSS!!!
> Woohoo, thanks for digging up those patches and testing them!
>
>> Updated bootstrap instructions here:
>> https://wiki.freebsd.org/GitWorkflow#Using_git-svn_.28FreeBSD_committers_only.29
>>
>> Updated how to merge pull requests here:
>> https://wiki.freebsd.org/GitWorkflow#Merging_pull_requests_from_github_using_git-svn_.28FreeBSD_committers_only.29
> I fear this page is becoming a little unreadable over time. The topic
> creeped from just getting a src clone, to covering all the various
> bases. And no, I don't have a good idea how to structure them better.
> Some feedback from the community as to what needs to be documented and
> what is hard to understand would help, I guess.

Sure, we can break the page up I don't mind.

Open to ideas.

>
>> Anyhow, the instructions have been updated to show you how to take pull
>> requests from github and commit them directly to the tree.
> I have never worked with phabricator, but how do people upload patches
> there? Can I "patch-bomb" it and send out my reviews with git somehow?
YES!!!!

it's "super easy":

# assuming /usr/src is git and on branch 'master'
# AND 'origin' is the freebsd git repo:
#  /usr/src % git remote -v | grep origin
#  origin    https://github.com/freebsd/freebsd (fetch)
#  origin    https://github.com/freebsd/freebsd (push)

cd /usr/src
git checkout your_branch
arc diff $(git merge-base origin/master YOUR_TOPIC_BRANCH)

The cool part is that so long as you keep running "arc diff $(git 
merge-base origin/master YOUR_TOPIC_BRANCH)" it will update the existing 
phabricator.

-Alfred






> Cheers,
> Uli
>