But `upstream` is just a name. I guess this is just a convenience make
target that "builds" the upstream bin/traceur.js? Maybe we should just
checkout that file instead of fast forwarding master? It seems like we are
doing a lot of things here that might be surprising.

I think this PR is not making it clear what problem it is solving.


On Mon, Dec 2, 2013 at 12:03 PM, johnjbarton <notifications@github.com>wrote:

> In Makefile:
>
> > -debug: clean $(SRC)
> > -	./traceur --out bin/traceur.js --sourcemap $(SRC)
> > +# Use last-known-good compiler to compile current source
> > +build/master-compiled-
> traceur.js: build/master-traceur.js $(SRC)
> > +	cp build/master-traceur.js bin/traceur.js
> > +	./traceur --out $@ $(TFLAGS) $(SRC)
> > +
> > +build/master-traceur.js:
> > +	mv bin/traceur.js build/traceur.js
> > +	git checkout master -- bin/traceur.js
> > +	mv bin/traceur.js build/master-traceur.js
> > +	mv build/traceur.js bin/traceur.js
> > +
> > +up:
> > +	git diff-index --quiet HEAD # check if the current tree has changes
> > +	git checkout master; git fetch upstream; git merge --ff-only upstream/master
>
> Just FYI I guess most contributors need to sync with upstream:
> https://help.github.com/articles/fork-a-repo
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/google/traceur-compiler/pull/483/files#r8031608>
> .
>



-- 
erik