Update intro script output

2 files changed, 46 insertions, 42 deletions

diff --git a/intro2-tldr.orig b/intro2-tldr.orig
index a4e19fa..f8862ef 100644
--- a/intro2-tldr.orig
+++ b/intro2-tldr.orig
@@ -1,5 +1,5 @@
 created new executable project hello in /tmp/hello.git/
-[master (root-commit) 6874b82] first commit
+[master (root-commit) 7bff778] first commit
  11 files changed, 99 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 build/.gitignore
@@ -35,7 +35,7 @@ hello
 
 + bdep init --config-create ../hello-gcc cc config.cxx=g++
 initializing in project /tmp/hello/
-created configuration /tmp/hello-gcc/ (1, default, forwarded, auto-synchronized)
+created configuration /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized
 synchronizing:
   new hello/0.1.0
 
diff --git a/intro2-tour.orig b/intro2-tour.orig
index 6406f61..8bfceaf 100644
--- a/intro2-tour.orig
+++ b/intro2-tour.orig
@@ -68,32 +68,36 @@ depends: * bpkg >= 0.7.0-
 
 + bdep init -C ../hello-gcc @gcc cc config.cxx=g++
 initializing in project /tmp/hello/
-created configuration @gcc /tmp/hello-gcc/ (1, default, forwarded, auto-synchronized)
+created configuration @gcc /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
 + bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0
 initializing in project /tmp/hello/
-created configuration @clang /tmp/hello-clang/ (2, auto-synchronized)
+created configuration @clang /tmp/hello-clang/ 2 auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
-+ ls -d -1 ../hello ../hello-clang ../hello-gcc ../hello-gcc-1 ../hello.git
++ ls -d -1 ../hello ../hello1 ../hello1-gccX ../hello-clang ../hello-clang1 ../hello-gcc ../hello-gcc1 ../hello-gccY ../hello.git
 ../hello
+../hello1
+../hello1-gccX
 ../hello-clang
+../hello-clang1
 ../hello-gcc
-../hello-gcc-1
+../hello-gcc1
+../hello-gccY
 ../hello.git
 
 + bdep init -C ../hello-vc-debug @debug cc config.cxx=cl-15 config.cc.coptions=/MDd /Z7 config.cc.loptions=/DEBUG
 initializing in project /tmp/hello/
-created configuration @debug /tmp/hello-vc-debug/ (3, auto-synchronized)
+created configuration @debug /tmp/hello-vc-debug/ 3 auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
 + bdep init -C ../hello-vc-release @release cc config.cxx=cl-15 config.cc.coptions=/O2
 initializing in project /tmp/hello/
-created configuration @release /tmp/hello-vc-release/ (4, auto-synchronized)
+created configuration @release /tmp/hello-vc-release/ 4 auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
@@ -144,7 +148,7 @@ test hello/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hel
 
 + bdep init -C ../hello-mingw @mingw cc config.cxx=x86_64-w64-mingw32-g++
 initializing in project /tmp/hello/
-created configuration @mingw /tmp/hello-mingw/ (5, auto-synchronized)
+created configuration @mingw /tmp/hello-mingw/ 5 auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
@@ -171,13 +175,13 @@ synchronizing:
 
 + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++
 created new executable project hello in /tmp/hello/
-created configuration @gcc /tmp/hello-gcc/ (1, default, forwarded, auto-synchronized)
+created configuration @gcc /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
 + bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0
 initializing in project /tmp/hello/
-created configuration @clang /tmp/hello-clang/ (2, auto-synchronized)
+created configuration @clang /tmp/hello-clang/ 2 auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
@@ -216,7 +220,7 @@ synchronizing:
   new libhello/1.0.0 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#1
 
-     0K ...                                                   100%  101M=0s
+     0K ...                                                   100% 98.3M=0s
 + b
 synchronizing /tmp/hello-gcc/:
   upgrade hello/0.1.0-a.0.19700101000000#2
@@ -245,23 +249,23 @@ synchronizing:
   new libhello/1.0.0 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#1
 
-     0K ...                                                   100% 98.1M=0s
+     0K ...                                                   100% 97.1M=0s
 + bdep test -ai
 in configuration @gcc:
 c++ ../hello-gcc/libhello-1.0.0/tests/basics/cxx{driver}
 ld ../hello-gcc/libhello-1.0.0/tests/basics/exe{driver}
-test ../hello-gcc/libhello-1.0.0/tests/basics/exe{driver}
 test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
+test ../hello-gcc/libhello-1.0.0/tests/basics/exe{driver}
 
 in configuration @clang:
 mkdir ../hello-clang/hello/fsdir{hello/}
 ver ../hello-clang/libhello-1.0.0/libhello/version.hxx.in
-c++ ../hello-clang/libhello-1.0.0/tests/basics/cxx{driver}
 c++ ../hello-clang/libhello-1.0.0/libhello/cxx{hello}
+c++ ../hello-clang/libhello-1.0.0/tests/basics/cxx{driver}
 c++ hello/cxx{hello}@../hello-clang/hello/hello/
 ld ../hello-clang/libhello-1.0.0/libhello/libs{hello}
-ld ../hello-clang/libhello-1.0.0/tests/basics/exe{driver}
 ld ../hello-clang/hello/hello/exe{hello}
+ld ../hello-clang/libhello-1.0.0/tests/basics/exe{driver}
 test hello/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
 test ../hello-clang/libhello-1.0.0/tests/basics/exe{driver}
 
@@ -276,7 +280,7 @@ synchronizing:
   new libhello/1.0.0 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#4
 
-     0K ...                                                   100% 17.9M=0s
+     0K ...                                                   100% 99.3M=0s
 + bdep fetch
 fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello)
 querying https://git.build2.org/hello/libhello.git
@@ -321,14 +325,14 @@ distributing libhello/1.0.0
 
 + bdep new -C libextra-gcc -t lib -l c++ libextra cc config.cxx=g++
 created new library project libextra in /tmp/libextra/
-created configuration /tmp/libextra-gcc/ (1, default, forwarded, auto-synchronized)
+created configuration /tmp/libextra-gcc/ 1 default,forwarded,auto-synchronized
 synchronizing:
   new libextra/0.1.0-a.0.19700101000000
 
 + b install: libextra/ config.install.root=/tmp/unpkg-gcc
 mkdir libextra-gcc/libextra/fsdir{libextra/}
-ver libextra/libextra/version.hxx.in
 c++ libextra/libextra/cxx{extra}@libextra-gcc/libextra/libextra/
+ver libextra/libextra/version.hxx.in
 c++ libextra/libextra/cxx{extra}@libextra-gcc/libextra/libextra/
 ld libextra-gcc/libextra/libextra/liba{extra}
 ld libextra-gcc/libextra/libextra/libs{extra}
@@ -368,7 +372,7 @@ unpkg-gcc
 
 + bdep init -C ../hello-gcc-1 @gcc1 cc config.cxx=g++ config.cc.poptions=-I/tmp/unpkg-gcc/include config.cc.loptions=-L/tmp/unpkg-gcc/lib
 initializing in project /tmp/hello/
-created configuration @gcc1 /tmp/hello-gcc-1/ (3, auto-synchronized)
+created configuration @gcc1 /tmp/hello-gcc-1/ 3 auto-synchronized
 fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello)
 querying https://git.build2.org/hello/libhello.git
 fetching from https://git.build2.org/hello/libhello.git
@@ -393,24 +397,24 @@ mkdir ../hello-gcc-1/hello/fsdir{hello/}
 ver ../hello-gcc-1/libhello-1.1.0/libhello/version.hxx.in
 ver ../hello-gcc-1/libformat-1.0.0/libformat/version.hxx.in
 ver ../hello-gcc-1/libprint-1.0.0/libprint/version.hxx.in
+c++ ../hello-gcc-1/libprint-1.0.0/libprint/cxx{print}
+c++ ../hello-gcc-1/libformat-1.0.0/libformat/cxx{format}
 c++ ../hello-gcc-1/libprint-1.0.0/tests/basics/cxx{driver}
 c++ ../hello-gcc-1/libformat-1.0.0/tests/basics/cxx{driver}
-c++ ../hello-gcc-1/libprint-1.0.0/libprint/cxx{print}
 c++ ../hello-gcc-1/libhello-1.1.0/libhello/cxx{hello}
-c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/
 c++ ../hello-gcc-1/libhello-1.1.0/tests/basics/cxx{driver}
-c++ ../hello-gcc-1/libformat-1.0.0/libformat/cxx{format}
+c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/
 ld ../hello-gcc-1/libprint-1.0.0/libprint/libs{print}
 ld ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
 ld ../hello-gcc-1/libformat-1.0.0/libformat/libs{format}
 ld ../hello-gcc-1/libformat-1.0.0/tests/basics/exe{driver}
 ld ../hello-gcc-1/libhello-1.1.0/libhello/libs{hello}
-ld ../hello-gcc-1/hello/hello/exe{hello}
 ld ../hello-gcc-1/libhello-1.1.0/tests/basics/exe{driver}
-test ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
+ld ../hello-gcc-1/hello/hello/exe{hello}
 test hello/test{testscript}@../hello-gcc-1/hello/hello/ ../hello-gcc-1/hello/hello/exe{hello}
-test ../hello-gcc-1/libformat-1.0.0/tests/basics/exe{driver}
+test ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
 test ../hello-gcc-1/libhello-1.1.0/tests/basics/exe{driver}
+test ../hello-gcc-1/libformat-1.0.0/tests/basics/exe{driver}
 
 + b configure: ../hello-gcc/ config.cc.poptions+=-I/tmp/unpkg-gcc/include config.cc.loptions+=-L/tmp/unpkg-gcc/lib
 save ../hello-gcc/build/config.build
@@ -430,7 +434,7 @@ test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/e
 synchronizing:
   configure sys:libsqlite3/*
   upgrade hello/0.1.0-a.0.19700101000000#5
-[master (root-commit) da9ce5a] Start hello project
+[master (root-commit) f892555] Start hello project
  11 files changed, 118 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 build/.gitignore
@@ -445,11 +449,11 @@ synchronizing:
  create mode 100644 repositories.manifest
 
 + bdep status
-hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180519161919.da9ce5af2580
+hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180522061352.f8925550d04d
 
 + b info
 project: hello
-version: 0.1.0-a.0.20180519161919.da9ce5af2580
+version: 0.1.0-a.0.20180522061352.f8925550d04d
 summary: hello executable
 url: https://example.org/hello
 src_root: /tmp/hello/
@@ -459,25 +463,25 @@ subprojects:
 
 + bdep sync
 synchronizing:
-  upgrade hello/0.1.0-a.0.20180519161919.da9ce5af2580
+  upgrade hello/0.1.0-a.0.20180522061352.f8925550d04d
 
 + bdep status
-hello configured 0.1.0-a.0.20180519161919.da9ce5af2580
-[master 0ccbfca] Another commit
+hello configured 0.1.0-a.0.20180522061352.f8925550d04d
+[master 5738026] Another commit
  1 file changed, 1 insertion(+)
 
 + bdep status
-hello configured 0.1.0-a.0.20180519161919.da9ce5af2580 available 0.1.0-a.0.20180519161920.0ccbfca20556
+hello configured 0.1.0-a.0.20180522061352.f8925550d04d available 0.1.0-a.0.20180522061353.5738026448c3
 
 + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++
 created new executable project hello in /tmp/hello/
-created configuration @gcc /tmp/hello-gcc/ (1, default, forwarded, auto-synchronized)
+created configuration @gcc /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
 + bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0
 initializing in project /tmp/hello/
-created configuration @clang /tmp/hello-clang/ (2, auto-synchronized)
+created configuration @clang /tmp/hello-clang/ 2 auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
@@ -488,13 +492,13 @@ created new library project libhello in /tmp/libhello/
 
 + bdep init -A ../hello-gcc @gcc
 initializing in project /tmp/libhello/
-added configuration @gcc /tmp/hello-gcc/ (1, default, forwarded, auto-synchronized)
+added configuration @gcc /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized
 synchronizing:
   new libhello/0.1.0-a.0.19700101000000
 
 + bdep init -A ../hello-clang @clang
 initializing in project /tmp/libhello/
-added configuration @clang /tmp/hello-clang/ (2, auto-synchronized)
+added configuration @clang /tmp/hello-clang/ 2 auto-synchronized
 synchronizing:
   new libhello/0.1.0-a.0.19700101000000
 
@@ -518,7 +522,7 @@ test ../hello-gcc/libhello/tests/basics/exe{driver}
 
 + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++
 created new executable project hello in /tmp/hello/hello/
-created configuration @gcc /tmp/hello/hello-gcc/ (1, default, forwarded, auto-synchronized)
+created configuration @gcc /tmp/hello/hello-gcc/ 1 default,forwarded,auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
@@ -526,7 +530,7 @@ synchronizing:
 
 + bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0
 initializing in project /tmp/hello/hello/
-created configuration @clang /tmp/hello/hello-clang/ (2, auto-synchronized)
+created configuration @clang /tmp/hello/hello-clang/ 2 auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
@@ -561,8 +565,8 @@ mkdir ../hello-gcc/libhello/tests/fsdir{basics/}
 mkdir ../hello-gcc/hello/fsdir{hello/}
 ver libhello/libhello/version.hxx.in
 c++ libhello/libhello/cxx{hello}@../hello-gcc/libhello/libhello/
-c++ libhello/tests/basics/cxx{driver}@../hello-gcc/libhello/tests/basics/
 c++ hello/hello/cxx{hello}@../hello-gcc/hello/hello/
+c++ libhello/tests/basics/cxx{driver}@../hello-gcc/libhello/tests/basics/
 ld ../hello-gcc/libhello/libhello/libs{hello}
 ld ../hello-gcc/hello/hello/exe{hello}
 ld ../hello-gcc/libhello/tests/basics/exe{driver}
@@ -607,10 +611,10 @@ configured hello/1.0.0
 ver libhello-1.1.0/libhello/version.hxx.in
 ver libformat-1.0.0/libformat/version.hxx.in
 ver libprint-1.0.0/libprint/version.hxx.in
-c++ hello-1.0.0/hello/cxx{hello}
-c++ libformat-1.0.0/libformat/cxx{format}
 c++ libprint-1.0.0/libprint/cxx{print}
 c++ libhello-1.1.0/libhello/cxx{hello}
+c++ libformat-1.0.0/libformat/cxx{format}
+c++ hello-1.0.0/hello/cxx{hello}
 ld libprint-1.0.0/libprint/libs{print}
 ld libformat-1.0.0/libformat/libs{format}
 ld libhello-1.1.0/libhello/libs{hello}