Skip to main content

Posts

Showing posts with the label nestedtrees

local svn:externals with bzr and by-reference trees

$ bzr branch https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk $ cd trunk/ $ svn proplist -v -R https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk | grep externals -C1 Properties on 'svn-checkout/mingw-w64-headers/ddk/include': svn:externals ddk svn://svn.reactos.org/reactos/trunk/reactos/include/ddk $ bzr branch svn://svn.reactos.org/reactos/trunk/reactos/include/ddk mingw-w64-headers/ddk/include/ddk $ bzr join mingw-w64-headers/ddk/include/ddk/ $ bzr ci -m "Merging svn:externals" $ bzr merge :parent https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk is permanently redirected to https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk/ +N mingw-w64-crt/misc/wcstof.c +N mingw-w64-headers/direct-x/include/d3dx9shape.h M mingw-w64-crt/ChangeLog #snip M mingw-w64-headers/include/ChangeLog M mingw-w64-headers/include/dbghelp.h All changes applied successfully. $ bzr ci -m "merged from upstream svn" $ bzr merge svn://sv