[PATCH] D56654: Update GettingStarted guide to recommend that people use the new official Git repository.

Mehdi AMINI via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Mon Jan 14 07:09:02 PST 2019


mehdi_amini added inline comments.


================
Comment at: llvm/docs/GettingStarted.rst:96
+       ``make -j NNN`` (with an appropriate value of NNN, e.g. number of CPUs
+       you have.)
 
----------------
jlebar wrote:
> or just `make -j`?
`make -j` is "unbounded" parallelism, it use to hang my machine for a while last time I tried it on clang.


================
Comment at: llvm/docs/GettingStarted.rst:450
 
-  % git diff master..mybranch > /path/to/mybranch.diff
+  % git diff origin/master..mybranch > /path/to/mybranch.diff
 
----------------
These instructions assume that "my branch" is perfectly rebased, I think this should use three dots to do what we want: `git diff origin/master...mybranch`


================
Comment at: llvm/docs/Phabricator.rst:200
 
   git checkout master
   git merge --ff-only arcpatch-D<Revision>
----------------
jlebar wrote:
> I would think that you don't want to merge the change into your local "master" branch, because you probably (?) want that to be a copy of origin/master, and upstream is going to rewrite this change.  IOW `git checkout master; git pull --ff-only origin/master` will fail.
> 
> Would it make more sense to checkout `arcpatch-D123`, merge origin/master into it, and then `git llvm push` from that branch?
> 
> (I'm also confused why we're talking about patching in a change from phab -- isn't the most likely scenario that you already have the change in your git repository?)
> Would it make more sense to checkout arcpatch-D123, merge origin/master into it, and then git llvm push from that branch?

My usual flow would be to rebase: `git checkout arcpatch-D123 && git fetch && git rebase origin/master`


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D56654/new/

https://reviews.llvm.org/D56654





More information about the llvm-commits mailing list