<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">I’ll give that a shot. Thank you!<br class=""><div class="">
<div style="color: rgb(0, 0, 0); font-family: 'Helvetica Neue'; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;"><br class="">--<br class="">Ryan Parman<br class=""><a href="https://github.com/skyzyx" class="">https://github.com/skyzyx</a><br class="">https://keybase.io/skyzyx<br class=""></div><div style="color: rgb(0, 0, 0); font-family: 'Helvetica Neue'; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;"><br class=""></div><br class="Apple-interchange-newline">
</div>
<br class=""><div style=""><blockquote type="cite" class=""><div class="">On Dec 8, 2016, at 3:08 AM, Alex Blewitt <<a href="mailto:alblue@apple.com" class="">alblue@apple.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">If you want to use the branch swift-3.0.2-PREVIEW-1 tag then you should run update-checkout with that tag name, to ensure that you're on the right one.<br class=""><br class="">You can run:<br class=""><br class="">swift/utils/update-checkout --tag swift-3.0.2-PREVIEW-1<br class=""><br class="">If you find that you have problems with repository state (that you didn't apply) then you can add --reset-to-remote or --clean, which will guarantee you are in a better starting point.<br class=""><br class="">Alex<br class=""><br class=""><blockquote type="cite" class="">On 8 Dec 2016, at 04:00, Ryan Parman via swift-users <<a href="mailto:swift-users@swift.org" class="">swift-users@swift.org</a>> wrote:<br class=""><br class="">I’ve been using Git for about 8 years now, so I know my way around. But in checking out a release of Swift, I’m running into errors.<br class=""><br class="">```<br class="">$ git clone -q -b swift-3.0.2-PREVIEW-1 <a href="https://github.com/apple/swift.git" class="">https://github.com/apple/swift.git</a>;<br class="">Note: checking out 'dc2c3d580f52367eebaada34901a945466e947df'.<br class=""><br class="">You are in 'detached HEAD' state. You can look around, make experimental<br class="">changes and commit them, and you can discard any commits you make in this<br class="">state without impacting any branches by performing another checkout.<br class=""><br class="">If you want to create a new branch to retain commits you create, you may<br class="">do so (now or later) by using -b with the checkout command again. Example:<br class=""><br class=""> git checkout -b <new-branch-name><br class="">```<br class=""><br class="">So far, so good. (I also did this exact same thing with swift-3.0.1-RELEASE — same issue.)<br class=""><br class="">Now, for the util scripts:<br class=""><br class="">```<br class="">$ cd swift && \<br class=""> ./utils/update-checkout --clone && \<br class=""> ./utils/build-script -r \<br class="">;<br class="">--- Cloning 'compiler-rt' ---<br class="">+ git clone --recursive <a href="https://github.com/apple/swift-compiler-rt.git" class="">https://github.com/apple/swift-compiler-rt.git</a> compiler-rt<br class="">Cloning into 'compiler-rt'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 67008, done.<br class="">remote: Compressing objects: 100% (721/721), done.<br class="">remote: Total 67008 (delta 461), reused 0 (delta 0), pack-reused 66286<br class="">Receiving objects: 100% (67008/67008), 12.01 MiB | 6.94 MiB/s, done.<br class="">Resolving deltas: 100% (54564/54564), done.<br class="">Already on 'stable'<br class="">Your branch is up-to-date with 'origin/stable'.<br class="">--- Cloning 'llvm' ---<br class="">+ git clone --recursive <a href="https://github.com/apple/swift-llvm.git" class="">https://github.com/apple/swift-llvm.git</a> llvm<br class="">Cloning into 'llvm'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 1288275, done.<br class="">remote: Compressing objects: 100% (1733/1733), done.<br class="">remote: Total 1288275 (delta 1048), reused 0 (delta 0), pack-reused 1286542<br class="">Receiving objects: 100% (1288275/1288275), 288.84 MiB | 10.42 MiB/s, done.<br class="">Resolving deltas: 100% (1065091/1065091), done.<br class="">Checking out files: 100% (22170/22170), done.<br class="">Already on 'stable'<br class="">Your branch is up-to-date with 'origin/stable'.<br class="">--- Cloning 'swift-xcode-playground-support' ---<br class="">+ git clone --recursive <a href="https://github.com/apple/swift-xcode-playground-support.git" class="">https://github.com/apple/swift-xcode-playground-support.git</a> swift-xcode-playground-support<br class="">Cloning into 'swift-xcode-playground-support'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 483, done.<br class="">remote: Total 483 (delta 0), reused 0 (delta 0), pack-reused 482<br class="">Receiving objects: 100% (483/483), 139.53 KiB | 0 bytes/s, done.<br class="">Resolving deltas: 100% (301/301), done.<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">--- Cloning 'swift-corelibs-foundation' ---<br class="">+ git clone --recursive <a href="https://github.com/apple/swift-corelibs-foundation.git" class="">https://github.com/apple/swift-corelibs-foundation.git</a> swift-corelibs-foundation<br class="">Cloning into 'swift-corelibs-foundation'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 13088, done.<br class="">remote: Compressing objects: 100% (58/58), done.<br class="">remote: Total 13088 (delta 17), reused 0 (delta 0), pack-reused 13030<br class="">Receiving objects: 100% (13088/13088), 8.57 MiB | 6.03 MiB/s, done.<br class="">Resolving deltas: 100% (9875/9875), done.<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">--- Cloning 'clang' ---<br class="">+ git clone --recursive <a href="https://github.com/apple/swift-clang.git" class="">https://github.com/apple/swift-clang.git</a> clang<br class="">Cloning into 'clang'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 628505, done.<br class="">remote: Compressing objects: 100% (498/498), done.<br class="">remote: Total 628505 (delta 316), reused 15 (delta 15), pack-reused 627992<br class="">Receiving objects: 100% (628505/628505), 128.49 MiB | 9.96 MiB/s, done.<br class="">Resolving deltas: 100% (532138/532138), done.<br class="">Checking out files: 100% (13004/13004), done.<br class="">Already on 'stable'<br class="">Your branch is up-to-date with 'origin/stable'.<br class="">--- Cloning 'llbuild' ---<br class="">+ git clone --recursive <a href="https://github.com/apple/swift-llbuild.git" class="">https://github.com/apple/swift-llbuild.git</a> llbuild<br class="">Cloning into 'llbuild'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 7253, done.<br class="">remote: Compressing objects: 100% (3/3), done.<br class="">remote: Total 7253 (delta 1), reused 0 (delta 0), pack-reused 7250<br class="">Receiving objects: 100% (7253/7253), 6.90 MiB | 4.61 MiB/s, done.<br class="">Resolving deltas: 100% (4769/4769), done.<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">--- Cloning 'cmark' ---<br class="">+ git clone --recursive <a href="https://github.com/apple/swift-cmark.git" class="">https://github.com/apple/swift-cmark.git</a> cmark<br class="">Cloning into 'cmark'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 8390, done.<br class="">remote: Compressing objects: 100% (2/2), done.<br class="">remote: Total 8390 (delta 1), reused 0 (delta 0), pack-reused 8388<br class="">Receiving objects: 100% (8390/8390), 2.75 MiB | 1.34 MiB/s, done.<br class="">Resolving deltas: 100% (5825/5825), done.<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">--- Cloning 'lldb' ---<br class="">+ git clone --recursive <a href="https://github.com/apple/swift-lldb.git" class="">https://github.com/apple/swift-lldb.git</a> lldb<br class="">Cloning into 'lldb'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 196362, done.<br class="">remote: Compressing objects: 100% (310/310), done.<br class="">remote: Total 196362 (delta 128), reused 0 (delta 0), pack-reused 196016<br class="">Receiving objects: 100% (196362/196362), 111.11 MiB | 9.09 MiB/s, done.<br class="">Resolving deltas: 100% (148069/148069), done.<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">--- Cloning 'swift-corelibs-xctest' ---<br class="">+ git clone --recursive <a href="https://github.com/apple/swift-corelibs-xctest.git" class="">https://github.com/apple/swift-corelibs-xctest.git</a> swift-corelibs-xctest<br class="">Cloning into 'swift-corelibs-xctest'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 2419, done.<br class="">remote: Compressing objects: 100% (14/14), done.<br class="">remote: Total 2419 (delta 1), reused 0 (delta 0), pack-reused 2404<br class="">Receiving objects: 100% (2419/2419), 494.95 KiB | 0 bytes/s, done.<br class="">Resolving deltas: 100% (1184/1184), done.<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">--- Cloning 'swift-integration-tests' ---<br class="">+ git clone --recursive <a href="https://github.com/apple/swift-integration-tests.git" class="">https://github.com/apple/swift-integration-tests.git</a> swift-integration-tests<br class="">Cloning into 'swift-integration-tests'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 280, done.<br class="">remote: Total 280 (delta 0), reused 0 (delta 0), pack-reused 279<br class="">Receiving objects: 100% (280/280), 38.71 KiB | 0 bytes/s, done.<br class="">Resolving deltas: 100% (156/156), done.<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">--- Cloning 'swiftpm' ---<br class="">+ git clone --recursive <a href="https://github.com/apple/swift-package-manager.git" class="">https://github.com/apple/swift-package-manager.git</a> swiftpm<br class="">Cloning into 'swiftpm'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 16567, done.<br class="">remote: Compressing objects: 100% (124/124), done.<br class="">remote: Total 16567 (delta 44), reused 0 (delta 0), pack-reused 16441<br class="">Receiving objects: 100% (16567/16567), 3.87 MiB | 3.27 MiB/s, done.<br class="">Resolving deltas: 100% (11574/11574), done.<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">--- Cloning 'swift-corelibs-libdispatch' ---<br class="">+ git clone --recursive <a href="https://github.com/apple/swift-corelibs-libdispatch.git" class="">https://github.com/apple/swift-corelibs-libdispatch.git</a> swift-corelibs-libdispatch<br class="">Cloning into 'swift-corelibs-libdispatch'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 3911, done.<br class="">remote: Compressing objects: 100% (2/2), done.<br class="">remote: Total 3911 (delta 0), reused 0 (delta 0), pack-reused 3909<br class="">Receiving objects: 100% (3911/3911), 1.75 MiB | 1.51 MiB/s, done.<br class="">Resolving deltas: 100% (2704/2704), done.<br class="">Submodule 'libkqueue' (<a href="https://github.com/mheily/libkqueue.git" class="">https://github.com/mheily/libkqueue.git</a>) registered for path 'libkqueue'<br class="">Submodule 'libpwq' (<a href="https://github.com/mheily/libpwq.git" class="">https://github.com/mheily/libpwq.git</a>) registered for path 'libpwq'<br class="">Cloning into '/root/package-swift/swift-corelibs-libdispatch/libkqueue'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 4313, done. <br class="">remote: Compressing objects: 100% (8/8), done. <br class="">remote: Total 4313 (delta 1), reused 0 (delta 0), pack-reused 4305 <br class="">Receiving objects: 100% (4313/4313), 991.03 KiB | 1.35 MiB/s, done.<br class="">Resolving deltas: 100% (2904/2904), done.<br class="">Cloning into '/root/package-swift/swift-corelibs-libdispatch/libpwq'...<br class="">warning: templates not found /usr/local/git/share/git-core/templates<br class="">remote: Counting objects: 1740, done. <br class="">remote: Total 1740 (delta 0), reused 0 (delta 0), pack-reused 1740 <br class="">Receiving objects: 100% (1740/1740), 469.59 KiB | 0 bytes/s, done.<br class="">Resolving deltas: 100% (1066/1066), done.<br class="">Submodule path 'libkqueue': checked out '1873b1864195ff00e82bec17fa650a89c4575d41'<br class="">Submodule path 'libpwq': checked out '23fba319ee26ae97dd4a64ff605d4bb613a016b2'<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">--- Updating '/root/package-swift/compiler-rt' ---<br class="">+ git fetch<br class="">+ git checkout stable<br class="">Already on 'stable'<br class="">Your branch is up-to-date with 'origin/stable'.<br class="">+ git rebase FETCH_HEAD<br class="">Current branch stable is up to date.<br class="">+ git submodule update --recursive<br class="">--- Updating '/root/package-swift/llvm' ---<br class="">+ git fetch<br class="">+ git checkout stable<br class="">Already on 'stable'<br class="">Your branch is up-to-date with 'origin/stable'.<br class="">+ git rebase FETCH_HEAD<br class="">Current branch stable is up to date.<br class="">+ git submodule update --recursive<br class="">--- Updating '/root/package-swift/swift-xcode-playground-support' ---<br class="">+ git fetch<br class="">+ git checkout master<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">+ git rebase FETCH_HEAD<br class="">Current branch master is up to date.<br class="">+ git submodule update --recursive<br class="">--- Updating '/root/package-swift/swift-corelibs-foundation' ---<br class="">+ git fetch<br class="">+ git checkout master<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">+ git rebase FETCH_HEAD<br class="">Current branch master is up to date.<br class="">+ git submodule update --recursive<br class="">--- Updating '/root/package-swift/clang' ---<br class="">+ git fetch<br class="">+ git checkout stable<br class="">Already on 'stable'<br class="">Your branch is up-to-date with 'origin/stable'.<br class="">+ git rebase FETCH_HEAD<br class="">Current branch stable is up to date.<br class="">+ git submodule update --recursive<br class="">--- Updating '/root/package-swift/llbuild' ---<br class="">+ git fetch<br class="">+ git checkout master<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">+ git rebase FETCH_HEAD<br class="">Current branch master is up to date.<br class="">+ git submodule update --recursive<br class="">--- Updating '/root/package-swift/cmark' ---<br class="">+ git fetch<br class="">+ git checkout master<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">+ git rebase FETCH_HEAD<br class="">Current branch master is up to date.<br class="">+ git submodule update --recursive<br class="">--- Updating '/root/package-swift/lldb' ---<br class="">+ git fetch<br class="">+ git checkout master<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">+ git rebase FETCH_HEAD<br class="">Current branch master is up to date.<br class="">+ git submodule update --recursive<br class="">--- Updating '/root/package-swift/swift-corelibs-xctest' ---<br class="">+ git fetch<br class="">+ git checkout master<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">+ git rebase FETCH_HEAD<br class="">Current branch master is up to date.<br class="">+ git submodule update --recursive<br class="">--- Updating '/root/package-swift/swift-integration-tests' ---<br class="">+ git fetch<br class="">+ git checkout master<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">+ git rebase FETCH_HEAD<br class="">Current branch master is up to date.<br class="">+ git submodule update --recursive<br class="">--- Updating '/root/package-swift/swiftpm' ---<br class="">+ git fetch<br class="">+ git checkout master<br class="">Already on 'master'<br class="">Your branch is up-to-date with 'origin/master'.<br class="">+ git rebase FETCH_HEAD<br class="">Current branch master is up to date.<br class="">+ git submodule update --recursive<br class="">--- Updating '/root/package-swift/swift' ---<br class="">+ git fetch<br class="">+ git checkout master<br class="">Checking out files: 100% (10034/10034), done.<br class="">Previous HEAD position was dc2c3d580f... Change version string to 'swift-3.0.2-PREVIEW-1'.<br class="">Branch master set up to track remote branch master from origin.<br class="">Switched to a new branch 'master'<br class="">+ git rebase FETCH_HEAD<br class="">First, rewinding head to replay your work on top of it...<br class="">Applying: [upstream-update] Rename of namespace clang::CodeGenOptions => clang::codegenoptions. NFC.<br class="">Using index info to reconstruct a base tree...<br class="">M lib/IRGen/IRGenModule.cpp<br class="">Falling back to patching base and 3-way merge...<br class="">Auto-merging lib/IRGen/IRGenModule.cpp<br class="">CONFLICT (content): Merge conflict in lib/IRGen/IRGenModule.cpp<br class="">error: Failed to merge in the changes.<br class="">Patch failed at 0001 [upstream-update] Rename of namespace clang::CodeGenOptions => clang::codegenoptions. NFC.<br class="">The copy of the patch that failed is found in: .git/rebase-apply/patch<br class=""><br class="">When you have resolved this problem, run "git rebase --continue".<br class="">If you prefer to skip this patch, run "git rebase --skip" instead.<br class="">To check out the original branch and stop rebasing, run "git rebase --abort".<br class=""><br class="">./utils/update-checkout: fatal error: command terminated with a non-zero exit status 128, aborting<br class="">make: *** [compile] Error 1<br class="">```<br class=""><br class="">I tried following the white rabbit for a while, resolving the merge conflicts (in favor of non-HEAD), but after a while I decided that this probably wasn’t normal and I should try asking here.<br class=""><br class="">Am I encountering something weird?<br class=""><br class="">Thanks for any pointers.<br class=""><br class="">--<br class="">Ryan Parman<br class=""><a href="https://github.com/skyzyx" class="">https://github.com/skyzyx</a><br class="">https://keybase.io/skyzyx<br class=""><br class=""><br class="">_______________________________________________<br class="">swift-users mailing list<br class="">swift-users@swift.org<br class="">https://lists.swift.org/mailman/listinfo/swift-users<br class=""></blockquote><br class=""></div></div></blockquote></div><br class=""></body></html>