forked from mruby/mruby
-
Notifications
You must be signed in to change notification settings - Fork 4
Repair iij branch
tsahara-iij edited this page Apr 10, 2013
·
10 revisions
iij ブランチを直す。
master からのマージがだいたい成功していた過去の状態に戻す。
- 作業ブランチを切る。
- 差分を下記に記録しつつ、分担できるよう、とりあえず commit する。
- conflict を潰す。デグレードはメモりつつ許容する。
- master からマージできることを確認する (master に差分が出た後で)。
- 機能的にアッパーコンパチなところまで持ってゆく。
kadath% git merge master ~/src/iij-repair
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Auto-merging Rakefile
CONFLICT (content): Merge conflict in Rakefile
Auto-merging build_config.rb
CONFLICT (content): Merge conflict in build_config.rb
Auto-merging include/mrbconf.h
CONFLICT (content): Merge conflict in include/mrbconf.h
Auto-merging include/mruby.h
CONFLICT (content): Merge conflict in include/mruby.h
Auto-merging include/mruby/class.h
CONFLICT (content): Merge conflict in include/mruby/class.h
Auto-merging include/mruby/compile.h
CONFLICT (content): Merge conflict in include/mruby/compile.h
Auto-merging include/mruby/dump.h
CONFLICT (content): Merge conflict in include/mruby/dump.h
Auto-merging include/mruby/string.h
CONFLICT (content): Merge conflict in include/mruby/string.h
Removing include/mruby/struct.h
Auto-merging mrbgems/mruby-math/src/math.c
Removing include/mruby/struct.h [55/194]
Auto-merging mrbgems/mruby-math/src/math.c
Auto-merging mrbgems/mruby-sprintf/src/sprintf.c
Auto-merging mrbgems/mruby-struct/src/struct.c
Auto-merging mrbgems/mruby-time/src/time.c
Auto-merging mrblib/array.rb
Auto-merging mrblib/error.rb
Auto-merging mrblib/hash.rb
Auto-merging mrblib/init_mrblib.c
CONFLICT (content): Merge conflict in mrblib/init_mrblib.c
Auto-merging mrblib/numeric.rb
Auto-merging mrblib/string.rb
CONFLICT (content): Merge conflict in mrblib/string.rb
Auto-merging src/codegen.c
CONFLICT (content): Merge conflict in src/codegen.c
Auto-merging src/dump.c
CONFLICT (content): Merge conflict in src/dump.c
CONFLICT (delete/modify): src/encoding.h deleted in master and modified in HEAD.
Version HEAD of src/encoding.h left in tree.
Auto-merging src/error.c
Auto-merging src/error.h
CONFLICT (content): Merge conflict in src/error.h
Auto-merging src/gc.c
CONFLICT (content): Merge conflict in src/gc.c
Auto-merging src/hash.c
Auto-merging src/init.c
Auto-merging src/load.c
CONFLICT (content): Merge conflict in src/load.c
Removing src/name2ctype.h
CONFLICT (content): Merge conflict in src/load.c [28/194]
Removing src/name2ctype.h
Auto-merging src/node.h
CONFLICT (content): Merge conflict in src/node.h
Auto-merging src/numeric.c
Auto-merging src/object.c
CONFLICT (content): Merge conflict in src/object.c
Removing src/oniguruma.h
Auto-merging src/parse.y
CONFLICT (content): Merge conflict in src/parse.y
CONFLICT (delete/modify): src/re.c deleted in master and modified in HEAD. Versi
on HEAD of src/re.c left in tree.
Auto-merging src/re.h
CONFLICT (content): Merge conflict in src/re.h
CONFLICT (delete/modify): src/regcomp.c deleted in master and modified in HEAD.
Version HEAD of src/regcomp.c left in tree.
CONFLICT (delete/modify): src/regenc.c deleted in master and modified in HEAD. V
ersion HEAD of src/regenc.c left in tree.
Removing src/regenc.h
Removing src/regerror.c
Removing src/regex.h
CONFLICT (delete/modify): src/regexec.c deleted in master and modified in HEAD.
Version HEAD of src/regexec.c left in tree.
CONFLICT (delete/modify): src/regint.h deleted in master and modified in HEAD. V
ersion HEAD of src/regint.h left in tree.
CONFLICT (delete/modify): src/regparse.c deleted in master and modified in HEAD.
Version HEAD of src/regparse.c left in tree.
Removing src/regparse.h
Removing src/st.c
Removing src/regparse.h [1/194]
Removing src/st.c
Removing src/st.h
Auto-merging src/state.c
Auto-merging src/string.c
CONFLICT (content): Merge conflict in src/string.c
Auto-merging src/variable.c
CONFLICT (content): Merge conflict in src/variable.c
Auto-merging tasks/mruby_build.rake
Auto-merging tasks/mruby_build_commands.rake
Auto-merging tasks/toolchains/gcc.rake
CONFLICT (content): Merge conflict in tasks/toolchains/gcc.rake
Auto-merging test/assert.rb
CONFLICT (content): Merge conflict in test/assert.rb
Auto-merging test/driver.c
Auto-merging test/mrbtest.rake
CONFLICT (content): Merge conflict in test/mrbtest.rake
Auto-merging test/t/array.rb
Auto-merging test/t/exception.rb
CONFLICT (content): Merge conflict in test/t/exception.rb
Removing test/t/math.rb
Auto-merging test/t/string.rb
CONFLICT (content): Merge conflict in test/t/string.rb
Auto-merging tools/mirb/mirb.c
Auto-merging tools/mrbc/mrbc.c
CONFLICT (content): Merge conflict in tools/mrbc/mrbc.c
Auto-merging tools/mruby/mruby.c
CONFLICT (content): Merge conflict in tools/mruby/mruby.c
Automatic merge failed; fix conflicts and then commit the result.
% git status ~/src/iij-repair
# On branch iij-repair
# Changes to be committed:
#
# modified: .travis.yml
# modified: AUTHORS
# modified: CONTRIBUTING.md
# modified: LEGAL
# modified: TODO
# new file: benchmark/fib39.rb
# modified: doc/mrbgems/README.md
# new file: examples/targets/ArduinoDue.rb
# new file: examples/targets/chipKitMax32.rb
# modified: include/mruby/array.h
# modified: include/mruby/data.h
# modified: include/mruby/hash.h
# modified: include/mruby/irep.h
# modified: include/mruby/khash.h
# modified: include/mruby/numeric.h
# modified: include/mruby/range.h
# deleted: include/mruby/struct.h
# modified: include/mruby/value.h
# modified: include/mruby/variable.h
# modified: minirake
# new file: mrbgems/mruby-array-ext/mrbgem.rake
# new file: mrbgems/mruby-array-ext/mrblib/array.rb
# new file: mrbgems/mruby-array-ext/src/array.c
# new file: mrbgems/mruby-array-ext/test/array.rb
# new file: mrbgems/mruby-enum-ext/mrbgem.rake
# new file: mrbgems/mruby-enum-ext/mrblib/enum.rb
# new file: mrbgems/mruby-enum-ext/test/enum.rb
# new file: mrbgems/mruby-eval/mrbgem.rake
# new file: mrbgems/mruby-eval/src/eval.c
# new file: mrbgems/mruby-hash-ext/mrbgem.rake
# new file: mrbgems/mruby-hash-ext/mrblib/hash.rb
# new file: mrbgems/mruby-hash-ext/test/hash.rb
# new file: mrbgems/mruby-math/mrbgem.rake
# renamed: src/math.c -> mrbgems/mruby-math/src/math.c
# new file: mrbgems/mruby-math/test/math.rb
# new file: mrbgems/mruby-numeric-ext/mrbgem.rake
# new file: mrbgems/mruby-numeric-ext/src/numeric_ext.c
# new file: mrbgems/mruby-numeric-ext/test/numeric.rb
# new file: mrbgems/mruby-print/mrbgem.rake
# new file: mrbgems/mruby-print/mrblib/print.rb
# new file: mrbgems/mruby-print/src/print.c
# new file: mrbgems/mruby-random/mrbgem.rake
# new file: mrbgems/mruby-random/src/mt19937ar.c
# new file: mrbgems/mruby-random/src/mt19937ar.h
# new file: mrbgems/mruby-random/src/random.c
# new file: mrbgems/mruby-random/src/random.h
# new file: mrbgems/mruby-random/test/random.rb
# new file: mrbgems/mruby-sprintf/mrbgem.rake
# new file: mrbgems/mruby-sprintf/src/kernel.c
# renamed: src/sprintf.c -> mrbgems/mruby-sprintf/src/sprintf.c
# new file: mrbgems/mruby-sprintf/test/sprintf.rb
# new file: mrbgems/mruby-string-ext/mrbgem.rake
# new file: mrbgems/mruby-string-ext/mrblib/string.rb
# new file: mrbgems/mruby-string-ext/src/string.c
# new file: mrbgems/mruby-string-ext/test/string.rb
# new file: mrbgems/mruby-struct/mrbgem.rake
# renamed: mrblib/struct.rb -> mrbgems/mruby-struct/mrblib/struct.rb
# renamed: src/struct.c -> mrbgems/mruby-struct/src/struct.c
# renamed: test/t/struct.rb -> mrbgems/mruby-struct/test/struct.rb
# new file: mrbgems/mruby-time/mrbgem.rake
# renamed: src/time.c -> mrbgems/mruby-time/src/time.c
# renamed: test/t/time.rb -> mrbgems/mruby-time/test/time.rb
# modified: mrblib/array.rb
# modified: mrblib/compar.rb
# modified: mrblib/enum.rb
# modified: mrblib/error.rb
# modified: mrblib/hash.rb
# modified: mrblib/kernel.rb
# modified: mrblib/mrblib.rake
# modified: mrblib/numeric.rb
# modified: mrblib/print.rb
# modified: src/array.c
# modified: src/class.c
# modified: src/crc.c
# modified: src/error.c
# modified: src/etc.c
# modified: src/hash.c
# modified: src/init.c
# modified: src/kernel.c
# modified: src/keywords
# modified: src/lex.def
# modified: src/mruby_core.rake
# deleted: src/name2ctype.h
# modified: src/numeric.c
# deleted: src/oniguruma.h
# modified: src/opcode.h
# modified: src/pool.c
# modified: src/print.c
# modified: src/proc.c
# modified: src/range.c
# deleted: src/regenc.h
# deleted: src/regerror.c
# deleted: src/regex.h
# deleted: src/regparse.h
# deleted: src/st.c
# deleted: src/st.h
# modified: src/state.c
# modified: src/symbol.c
# new file: src/value_array.h
# modified: src/vm.c
# modified: tasks/mrbgem_spec.rake
# modified: tasks/mrbgems.rake
# modified: tasks/mrbgems_test.rake
# modified: tasks/mruby_build.rake
# modified: tasks/mruby_build_commands.rake
# modified: tasks/mruby_build_gem.rake
# modified: tasks/ruby_ext.rake
# modified: tasks/toolchains/androideabi.rake
# modified: tasks/toolchains/vs2012.rake
# modified: test/driver.c
# modified: test/init_mrbtest.c
# modified: test/t/array.rb
# modified: test/t/class.rb
# modified: test/t/comparable.rb
# modified: test/t/hash.rb
# modified: test/t/kernel.rb
# modified: test/t/literals.rb
# deleted: test/t/math.rb
# modified: test/t/module.rb
# modified: test/t/nameerror.rb
# modified: tools/mirb/mirb.c
# modified: tools/mirb/mirb.rake
# modified: tools/mrbc/mrbc.rake
# modified: tools/mruby/mruby.rake
# new file: travis_config.rb
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: .gitignore
# both modified: README.md
# both modified: Rakefile
# both modified: build_config.rb
# both modified: include/mrbconf.h
# both modified: include/mruby.h
# both modified: include/mruby/class.h
# both modified: include/mruby/compile.h
# both modified: include/mruby/dump.h
# both modified: include/mruby/string.h
# both modified: mrblib/init_mrblib.c
# both modified: mrblib/string.rb
# both modified: src/codegen.c
# both modified: src/dump.c
# deleted by them: src/encoding.h
# both modified: src/error.h
# both modified: src/gc.c
# both modified: src/load.c
# both modified: src/node.h
# both modified: src/object.c
# both modified: src/parse.y
# deleted by them: src/re.c
# both modified: src/re.h
# deleted by them: src/regcomp.c
# deleted by them: src/regenc.c
# deleted by them: src/regexec.c
# deleted by them: src/regint.h
# deleted by them: src/regparse.c
# both modified: src/string.c
# both modified: src/variable.c
# both modified: tasks/toolchains/gcc.rake
# both modified: test/assert.rb
# both modified: test/mrbtest.rake
# both modified: test/t/exception.rb
# both modified: test/t/string.rb
# both modified: tools/mrbc/mrbc.c
# both modified: tools/mruby/mruby.c
#
* tsahara
Conflicts:
.gitignore
README.md
Rakefile
build_config.rb
include/mrbconf.h
include/mruby.h
include/mruby/class.h
include/mruby/compile.h
include/mruby/dump.h
include/mruby/string.h
* yumiyama
mrblib/init_mrblib.c
mrblib/string.rb
src/codegen.c
src/dump.c
src/encoding.h
src/error.h
src/gc.c
src/load.c
src/node.h
* kouki-o
src/object.c
src/parse.y
src/re.c
src/re.h
src/regcomp.c
src/regenc.c
src/regexec.c
src/regint.h
src/regparse.c
src/string.c (->tsahara)
* aki-mochi
src/variable.c (->tsahara)
tasks/toolchains/gcc.rake
test/assert.rb (->yumiyama)
test/mrbtest.rake
test/t/exception.rb (->yumiyama)
test/t/string.rb
tools/mrbc/mrbc.c
tools/mruby/mruby.c (->yumiyama)