Hi, I don't reach to get the last changes in libs/core after un update of the whole boost repository and it modules cd modular-boost git checkout master git pull git submodule update viboes$ pwd /Users/viboes/github/modular-boost/libs/core viboes$ ls What I need to do to see this new repository? Vicente
On Wed, Jun 4, 2014 at 2:47 PM, Vicente J. Botet Escriba < vicente.botet@wanadoo.fr> wrote:
Well that's the commit for the latest master version of predef. And it's certainly there. No idea what's going on. What command prompted the error? -- -- Rene Rivera -- Grafik - Don't Assume Anything -- Robot Dreams - http://robot-dreams.net -- rrivera/acm.org (msn) - grafikrobot/aim,yahoo,skype,efnet,gmail
Le 04/06/14 21:53, Rene Rivera a écrit :
git submodule update The same thing if I goes to develop branch I've cloned the whole repository again and I have no more issues. I don''t master the git commands, and as lately there has been some new repositories I surely missed a command that must be done in these cases. Best, Vicente
On 4 June 2014 20:47, Vicente J. Botet Escriba
When you get that the actual error is normally earlier in the output. It could be that the fetch failed, or that you've got a change in your local copy so it won't overwrite it with the new version. Try changing to 'libs/predef' and run 'git fetch' and 'git status'.
Le 04/06/14 22:22, Daniel James a écrit :
See the result of the commands below. I don't know why there are merge issues, as I didn't changed anything in this repository :( Thanks, Vicente cd ../modular-boost/libs/predef/ new-host:predef viboes$ git fetch remote: Counting objects: 2, done. remote: Compressing objects: 100% (2/2), done. remote: Total 2 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (2/2), done. From github.com:boostorg/predef db42762..dc66ebd develop -> origin/develop new-host:predef viboes$ git status # On branch master # Your branch and 'origin/master' have diverged, # and have 5 and 74 different commit(s) each, respectively. # # Changes to be committed: # # new file: .gitignore # new file: .project # new file: doc/history.qbk # new file: doc/html/.gitignore # new file: doc/html/predef/history.html # new file: doc/html/predef/reference/boost_plat_platform_macros.html # new file: doc/html/predef/to_do.html # new file: doc/todo.qbk # new file: include/boost/predef/detail/comp_detected.h # new file: include/boost/predef/detail/platform_detected.h # new file: include/boost/predef/os/ios.h # new file: include/boost/predef/platform/windows_desktop.h # new file: include/boost/predef/platform/windows_phone.h # new file: include/boost/predef/platform/windows_runtime.h # new file: include/boost/predef/platform/windows_store.h # new file: include/boost/predef/version.h # new file: jamroot.jam # new file: test/.gitignore # # Unmerged paths: # (use "git add/rm <file>..." as appropriate to mark resolution) # # both added: doc/build.jam # both added: doc/html/index.html # both added: doc/html/predef/acknoledgements.html # both added: doc/html/predef/adding_new_predefs.html # both added: doc/html/predef/introduction.html # both added: doc/html/predef/reference.html # both added: doc/html/predef/reference/boost_arch_architecture_macros.html # both added: doc/html/predef/reference/boost_comp_compiler_macros.html # both added: doc/html/predef/reference/boost_lang_language_standards_ma.html # both added: doc/html/predef/reference/boost_lib_library_macros.html # both added: doc/html/predef/reference/boost_os_operating_system_macros.html # both added: doc/html/predef/reference/other_macros.html # both added: doc/html/predef/reference/version_definition_macros.html # both added: doc/html/predef/using_the_predefs.html # both added: doc/predef.qbk # both added: include/boost/predef.h # both added: include/boost/predef/architecture.h # both added: include/boost/predef/architecture/alpha.h # both added: include/boost/predef/architecture/arm.h # both added: include/boost/predef/architecture/blackfin.h # both added: include/boost/predef/architecture/convex.h # both added: include/boost/predef/architecture/ia64.h # both added: include/boost/predef/architecture/m68k.h # both added: include/boost/predef/architecture/mips.h # both added: include/boost/predef/architecture/parisc.h # both added: include/boost/predef/architecture/ppc.h # both added: include/boost/predef/architecture/pyramid.h # both added: include/boost/predef/architecture/rs6k.h # both added: include/boost/predef/architecture/sparc.h # both added: include/boost/predef/architecture/superh.h # both added: include/boost/predef/architecture/sys370.h # both added: include/boost/predef/architecture/sys390.h # both added: include/boost/predef/architecture/x86.h # both added: include/boost/predef/architecture/x86/32.h # both added: include/boost/predef/architecture/x86/64.h # both added: include/boost/predef/architecture/z.h # both added: include/boost/predef/compiler.h # both added: include/boost/predef/compiler/borland.h # both added: include/boost/predef/compiler/clang.h # both added: include/boost/predef/compiler/comeau.h # both added: include/boost/predef/compiler/compaq.h # both added: include/boost/predef/compiler/diab.h # both added: include/boost/predef/compiler/digitalmars.h # both added: include/boost/predef/compiler/dignus.h # both added: include/boost/predef/compiler/edg.h # both added: include/boost/predef/compiler/ekopath.h # both added: include/boost/predef/compiler/gcc.h # both added: include/boost/predef/compiler/gcc_xml.h # both added: include/boost/predef/compiler/greenhills.h # both added: include/boost/predef/compiler/hp_acc.h # both added: include/boost/predef/compiler/iar.h # both added: include/boost/predef/compiler/ibm.h # both added: include/boost/predef/compiler/intel.h # both added: include/boost/predef/compiler/kai.h # both added: include/boost/predef/compiler/llvm.h # both added: include/boost/predef/compiler/metaware.h # both added: include/boost/predef/compiler/metrowerks.h # both added: include/boost/predef/compiler/microtec.h # both added: include/boost/predef/compiler/mpw.h # both added: include/boost/predef/compiler/palm.h # both added: include/boost/predef/compiler/pgi.h # both added: include/boost/predef/compiler/sgi_mipspro.h # both added: include/boost/predef/compiler/sunpro.h # both added: include/boost/predef/compiler/tendra.h # both added: include/boost/predef/compiler/visualc.h # both added: include/boost/predef/compiler/watcom.h # both added: include/boost/predef/detail/_cassert.h # both added: include/boost/predef/detail/_exception.h # both added: include/boost/predef/detail/endian_compat.h # both added: include/boost/predef/detail/os_detected.h # both added: include/boost/predef/detail/test.h # both added: include/boost/predef/language.h # both added: include/boost/predef/language/objc.h # both added: include/boost/predef/language/stdc.h # both added: include/boost/predef/language/stdcpp.h # both added: include/boost/predef/library.h # both added: include/boost/predef/library/c.h # both added: include/boost/predef/library/c/_prefix.h # both added: include/boost/predef/library/c/gnu.h # both added: include/boost/predef/library/c/uc.h # both added: include/boost/predef/library/c/vms.h # both added: include/boost/predef/library/c/zos.h # both added: include/boost/predef/library/std.h # both added: include/boost/predef/library/std/_prefix.h # both added: include/boost/predef/library/std/cxx.h # both added: include/boost/predef/library/std/dinkumware.h # both added: include/boost/predef/library/std/libcomo.h # both added: include/boost/predef/library/std/modena.h # both added: include/boost/predef/library/std/msl.h # both added: include/boost/predef/library/std/roguewave.h # both added: include/boost/predef/library/std/sgi.h # both added: include/boost/predef/library/std/stdcpp3.h # both added: include/boost/predef/library/std/stlport.h # both added: include/boost/predef/library/std/vacpp.h # both added: include/boost/predef/make.h # both added: include/boost/predef/os.h # both added: include/boost/predef/os/aix.h # both added: include/boost/predef/os/amigaos.h # both added: include/boost/predef/os/android.h # both added: include/boost/predef/os/beos.h # both added: include/boost/predef/os/bsd.h # both added: include/boost/predef/os/bsd/bsdi.h # both added: include/boost/predef/os/bsd/dragonfly.h # both added: include/boost/predef/os/bsd/free.h # both added: include/boost/predef/os/bsd/net.h # both added: include/boost/predef/os/bsd/open.h # both added: include/boost/predef/os/cygwin.h # both added: include/boost/predef/os/hpux.h # both added: include/boost/predef/os/irix.h # both added: include/boost/predef/os/linux.h # both added: include/boost/predef/os/macos.h # both added: include/boost/predef/os/os400.h # both added: include/boost/predef/os/qnxnto.h # both added: include/boost/predef/os/solaris.h # both added: include/boost/predef/os/unix.h # both added: include/boost/predef/os/vms.h # both added: include/boost/predef/os/windows.h # both added: include/boost/predef/other.h # both added: include/boost/predef/other/endian.h # both added: include/boost/predef/platform.h # both added: include/boost/predef/platform/mingw.h # both added: include/boost/predef/version_number.h # both added: index.html # both added: test/build.jam # both added: test/info_as_c.c # both added: test/info_as_cpp.cpp # both added: test/info_as_objc.m # both added: test/info_as_objcpp.mm # both added: test/macos_endian.c # both added: test/macos_vs_bsd.c # both added: test/make.cpp # both added: test/version.cpp #
On 4 June 2014 22:08, Vicente J. Botet Escriba
I don't know why there are merge issues, as I didn't changed anything in this repository :(
Then the best thing is probably just to run 'git reset --hard' in the predef directory to undo the changes. My guess is that you had the old branch converted from subversion and ran 'git pull' and it tried to merge them both. That kind of problem can happen when there's a discontinuous history, which shouldn't happen again.
Hi, Andrey Semashev wrote On 5-6-2014 11:16:
I added a few lines about this valuable piece of information to: https://svn.boost.org/trac/boost/wiki/StartModMaint After --init, run it also without --init because it does not update the already initialized submodules. Regards, Barend
Peter Dimov wrote On 18-6-2014 12:30:
OK - could not test it myself because I already used it before, without --init But I got this from StackOverflow: http://stackoverflow.com/questions/10168449/git-update-submodule-recursive (don't know if the recursive flags is relevant) Regards, Barend
Peter Dimov wrote:
Yes, I also always use --init and it's ok (btw, http://git-scm.com/docs/git-submodule). However this option is probably needed only if we expect that there were new submodules added recently. So e.g.: git checkout develop git pull git submodule update --init Then to be sure: git submodule foreach 'git checkout develop; git pull' And if the files were relocated, new module created, etc. you should also probably delete the BOOST_ROOT/boost directory and rerun b2 headers. And AFAIK the similar procedure is done by the regression testing tool, besides that it downloads the clean clone and runs b2 headers from scratch. So the above works for me. Regards, Adam
participants (9)
-
Adam Wulkiewicz -
Andrey Semashev -
Barend Gehrels -
Daniel James -
Glen Fernandes -
Paul A. Bristow -
Peter Dimov -
Rene Rivera -
Vicente J. Botet Escriba