[OmniOS-discuss] omnios-build broken

[Michael Rasmussen]

Hi all,

Did:
1) git clone https://github.com/omniti-labs/omnios-build.git
2) git checkout -b r151006
3) git branch --set-upstream-to=origin/r151006 r151006
4) git pull

Response:
Auto-merging lib/site.sh
CONFLICT (content): Merge conflict in lib/site.sh
Auto-merging lib/functions.sh
CONFLICT (content): Merge conflict in lib/functions.sh
Auto-merging lib/config.sh
CONFLICT (content): Merge conflict in lib/config.sh
Auto-merging build/xz/build.sh
CONFLICT (content): Merge conflict in build/xz/build.sh
Auto-merging build/release/root/etc/release
CONFLICT (content): Merge conflict in build/release/root/etc/release
Auto-merging build/release/name.p5m
CONFLICT (content): Merge conflict in build/release/name.p5m
Auto-merging build/python26/patches/series
CONFLICT (content): Merge conflict in build/python26/patches/series
CONFLICT (modify/delete): build/perl/perl-5142_module_sun-solaris.p5m
deleted in HEAD and modified in
1977b2c316c798901b49ebf97fe7cd5601e6fdb9. Version
1977b2c316c798901b49ebf97fe7cd5601e6fdb9 of
build/perl/perl-5142_module_sun-solaris.p5m left in tree. CONFLICT
(modify/delete): build/perl/perl-5142_manual.p5m deleted in HEAD and
modified in 1977b2c316c798901b49ebf97fe7cd5601e6fdb9. Version
1977b2c316c798901b49ebf97fe7cd5601e6fdb9 of
build/perl/perl-5142_manual.p5m left in tree. CONFLICT (modify/delete):
build/perl/perl-5142.p5m deleted in HEAD and modified in
1977b2c316c798901b49ebf97fe7cd5601e6fdb9. Version
1977b2c316c798901b49ebf97fe7cd5601e6fdb9 of build/perl/perl-5142.p5m
left in tree. CONFLICT (modify/delete): build/perl/perl-5142-64.p5m
deleted in HEAD and modified in
1977b2c316c798901b49ebf97fe7cd5601e6fdb9. Version
1977b2c316c798901b49ebf97fe7cd5601e6fdb9 of build/perl/perl-5142-64.p5m
left in tree. Auto-merging build/pciutils/build.sh CONFLICT (content):
Merge conflict in build/pciutils/build.sh Auto-merging
build/pci.ids/pci.ids CONFLICT (content): Merge conflict in
build/pci.ids/pci.ids CONFLICT (modify/delete): build/nspr/build.sh
deleted in HEAD and modified in
1977b2c316c798901b49ebf97fe7cd5601e6fdb9. Version
1977b2c316c798901b49ebf97fe7cd5601e6fdb9 of build/nspr/build.sh left in
tree. CONFLICT (modify/delete):
build/mozilla-nss/files/SunOS5.11_i86pc.mk deleted in HEAD and modified
in 1977b2c316c798901b49ebf97fe7cd5601e6fdb9. Version
1977b2c316c798901b49ebf97fe7cd5601e6fdb9 of
build/mozilla-nss/files/SunOS5.11_i86pc.mk left in tree. CONFLICT
(modify/delete): build/math/local.mog deleted in HEAD and modified in
1977b2c316c798901b49ebf97fe7cd5601e6fdb9. Version
1977b2c316c798901b49ebf97fe7cd5601e6fdb9 of build/math/local.mog left
in tree. CONFLICT (modify/delete): build/math/build.sh deleted in HEAD
and modified in 1977b2c316c798901b49ebf97fe7cd5601e6fdb9. Version
1977b2c316c798901b49ebf97fe7cd5601e6fdb9 of build/math/build.sh left in
tree. Auto-merging build/libxml2/build.sh Auto-merging
build/libtool/build.sh CONFLICT (content): Merge conflict in
build/libtool/build.sh Auto-merging
build/libffi/patches/unwind-instead-of-exceptions.patch CONFLICT
(add/add): Merge conflict in
build/libffi/patches/unwind-instead-of-exceptions.patch Auto-merging
build/kayak/build.sh CONFLICT (content): Merge conflict in
build/kayak/build.sh Auto-merging build/jeos/omnios-userland.p5m
CONFLICT (content): Merge conflict in build/jeos/omnios-userland.p5m
Auto-merging build/jeos/illumos-gate.p5m CONFLICT (content): Merge
conflict in build/jeos/illumos-gate.p5m Auto-merging
build/illumos/build.sh Auto-merging build/illumos-kvm/build.sh CONFLICT
(content): Merge conflict in build/illumos-kvm/build.sh Auto-merging
build/git/build.sh CONFLICT (content): Merge conflict in
build/git/build.sh Auto-merging build/gcc48/build.sh CONFLICT
(content): Merge conflict in build/gcc48/build.sh Auto-merging
build/expat/patches/unwind.patch CONFLICT (add/add): Merge conflict in
build/expat/patches/unwind.patch Auto-merging build/expat/build.sh
Auto-merging build/entire/entire.p5m CONFLICT (content): Merge conflict
in build/entire/entire.p5m Auto-merging build/curl/build.sh
Auto-merging build/ca-bundle/build.sh CONFLICT (content): Merge
conflict in build/ca-bundle/build.sh Auto-merging build/bind/build.sh
CONFLICT (content): Merge conflict in build/bind/build.sh Auto-merging
build/bash/patches/series CONFLICT (content): Merge conflict in
build/bash/patches/series Auto-merging build/bash/build.sh CONFLICT
(content): Merge conflict in build/bash/build.sh Automatic merge
failed; fix conflicts and then commit the result.

-- 
Hilsen/Regards
Michael Rasmussen

Get my public GnuPG keys:
michael <at> rasmussen <dot> cc
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xD3C9A00E
mir <at> datanom <dot> net
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xE501F51C
mir <at> miras <dot> org
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xE3E80917
--------------------------------------------------------------
/usr/games/fortune -es says:
Remark of Dr. Baldwin's concerning upstarts: We don't care to eat
toadstools that think they are truffles.
		-- Mark Twain, "Pudd'nhead Wilson's Calendar"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: OpenPGP digital signature
URL: <https://omniosce.org/ml-archive/attachments/20150121/a3bfd8fe/attachment-0001.bin>