Skip to content

--git option to track generated files in scala-bootstrapper branch #5

Merged
merged 10 commits into from Jun 1, 2011

3 participants

@jaked
Twitter, Inc. member
jaked commented May 3, 2011

For new projects:
First run: generate files into scala-bootstrapper branch, merge it to master
Subsequent runs: same thing

For existing projects (where scala-bootstrapper is not already a parent of master head)
First run: generate files into scala-bootstrapper branch, merge it to master but don't actually merge the changes (it becomes an ancestor of master)
Subsequent runs: generate files into scala-bootstrapper branch, merge it to master

@robey
robey commented May 5, 2011

i tried this out on ostrich, but it doesn't look like it works.

robey@jonsnow:~/twitter/ostrich (fetch_stats)$ scala-bootstrapper ostrich --git
uncommitted files in directory
robey@jonsnow:~/twitter/ostrich (fetch_stats)$ git status

On branch fetch_stats

nothing to commit (working directory clean)

@jaked
Twitter, Inc. member
jaked commented May 17, 2011

Looks like some of this was merged several days ago, thanks! Would you please merge the remaining fixes? Or, Kyle, if you want me to do it myself let me know.

@fizx
fizx commented May 18, 2011

[kmaxwell@tw-mbp-kmaxwell ~/workspace]$ ./scala-bootstrapper/bin/scala-bootstrapper --git addressbook
files in directory, no git repo.

@jaked
Twitter, Inc. member
jaked commented May 18, 2011

The README says you are supposed to cd into the project directory, then run scala-bootstrapper.

@jaked jaked Merge remote branch 'upstream/master'
Conflicts:
	bin/scala-bootstrapper
8aac5ff
@jaked
Twitter, Inc. member
jaked commented Jun 1, 2011

ping?

@fizx
fizx commented Jun 1, 2011

+1

@fizx fizx merged commit 02c3854 into twitter:master Jun 1, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.