Mercurial > hg > Members > ikki > CbC_log
view log28pm.txt @ 1:81cf42d17859
add log
author | ichikitakahiro <e165713@ie.u-ryukyu.ac.jp> |
---|---|
date | Sun, 28 Feb 2021 18:08:51 +0900 |
parents | |
children |
line wrap: on
line source
ichikitakahiro % vim test4.c ichikitakahiro % $CBC_COMPILER -Wall -O0 -g test4.c zsh: command not found: -Wall ichikitakahiro % pwd /Users/ichikitakahiro/workspace/cr/CbC_log ichikitakahiro % $CBC_COMPILER -Wall -O0 -g test4.c zsh: command not found: -Wall ichikitakahiro % . ~/.zshrc ichikitakahiro % $CBC_COMPILER -Wall -O0 -g test4.c test4.c: In function 'CG1': test4.c:8:8: error: too few arguments to function 'codes[i + 1]' 8 | goto codes[i+1](); | ^~~~~ test4.c:8:20: error: expected code segment jump or '*' before ';' token 8 | goto codes[i+1](); | ^ test4.c: In function 'CG2': test4.c:13:8: error: too few arguments to function 'codes[i + 1]' 13 | goto codes[i+1](); | ^~~~~ test4.c:13:20: error: expected code segment jump or '*' before ';' token 13 | goto codes[i+1](); | ^ test4.c: In function 'main': test4.c:23:8: error: too few arguments to function 'codes[0]' 23 | goto codes[0](); | ^~~~~ test4.c:23:18: error: expected code segment jump or '*' before ';' token 23 | goto codes[0](); | ^ ichikitakahiro % vim test4.c ichikitakahiro % vim test4.c ichikitakahiro % $CBC_COMPILER -Wall -O0 -g test4.c ichikitakahiro % ./a.out CG1 CG2 CG3 ichikitakahiro % vim test4.c ichikitakahiro % pwd /Users/ichikitakahiro/workspace/cr/CbC_log ichikitakahiro % ls CbC_history.txt a.out a.out.dSYM test4.c ichikitakahiro % lldb a.out (lldb) target create "a.out" bCurrent executable set to 'a.out' (x86_64). (lldb) b main Breakpoint 1: where = a.out`main + 4 at test4.c:20:12, address = 0x0000000100000e90 (lldb) process la Process 77501 launched: '/Users/ichikitakahiro/workspace/cr/CbC_log/a.out' (x86_64) Process 77501 stopped * thread #1, queue = 'com.apple.main-thread', stop reason = breakpoint 1.1 frame #0: 0x0000000100000e90 a.out`main at test4.c:20:12 17 } 18 19 int main(){ -> 20 codes[0] = CG1; 21 codes[1] = CG2; 22 codes[2] = CG3; 23 goto codes[0](0); Target 0: (a.out) stopped. (lldb) nn error: 'nn' is not a valid command. (lldb) n Process 77501 stopped * thread #1, queue = 'com.apple.main-thread', stop reason = step over frame #0: 0x0000000100000e9e a.out`main at test4.c:21:12 18 19 int main(){ 20 codes[0] = CG1; -> 21 codes[1] = CG2; 22 codes[2] = CG3; 23 goto codes[0](0); 24 } Target 0: (a.out) stopped. (lldb) n Process 77501 stopped * thread #1, queue = 'com.apple.main-thread', stop reason = step over frame #0: 0x0000000100000eac a.out`main at test4.c:22:12 19 int main(){ 20 codes[0] = CG1; 21 codes[1] = CG2; -> 22 codes[2] = CG3; 23 goto codes[0](0); 24 } Target 0: (a.out) stopped. (lldb) p CG1 (void (*)(int)) $0 = 0x0000000100000df8 (a.out`CG1 at test4.c:6:18) (lldb) p codes (void (*[3])(int)) $1 = { [0] = 0x0000000100000df8 (a.out`CG1 at test4.c:6:18) [1] = 0x0000000100000e35 (a.out`CG2 at test4.c:11:18) [2] = 0x0000000000000000 } (lldb) x/20i codes[0] 0x100000df8: 55 pushq %rbp 0x100000df9: 48 89 e5 movq %rsp, %rbp 0x100000dfc: 48 83 ec 10 subq $0x10, %rsp 0x100000e00: 89 7d fc movl %edi, -0x4(%rbp) 0x100000e03: 48 8d 3d f0 00 00 00 leaq 0xf0(%rip), %rdi ; "CG1" 0x100000e0a: e8 cb 00 00 00 callq 0x100000eda ; symbol stub for: puts 0x100000e0f: 8b 45 fc movl -0x4(%rbp), %eax 0x100000e12: 83 c0 01 addl $0x1, %eax 0x100000e15: 48 98 cltq 0x100000e17: 48 8d 14 c5 00 00 00 00 leaq (,%rax,8), %rdx 0x100000e1f: 48 8d 05 ea 11 00 00 leaq 0x11ea(%rip), %rax ; codes 0x100000e26: 48 8b 14 02 movq (%rdx,%rax), %rdx 0x100000e2a: 8b 45 fc movl -0x4(%rbp), %eax 0x100000e2d: 83 c0 01 addl $0x1, %eax 0x100000e30: 89 c7 movl %eax, %edi 0x100000e32: c9 leave 0x100000e33: ff e2 jmpq *%rdx 0x100000e35: 55 pushq %rbp 0x100000e36: 48 89 e5 movq %rsp, %rbp 0x100000e39: 48 83 ec 10 subq $0x10, %rsp (lldb) n Process 77501 stopped * thread #1, queue = 'com.apple.main-thread', stop reason = step over frame #0: 0x0000000100000eba a.out`main at test4.c:23:13 20 codes[0] = CG1; 21 codes[1] = CG2; 22 codes[2] = CG3; -> 23 goto codes[0](0); 24 } Target 0: (a.out) stopped. (lldb) s Process 77501 stopped * thread #1, queue = 'com.apple.main-thread', stop reason = step in frame #0: 0x0000000100000e03 a.out`CG1(i=0) at test4.c:7:3 4 __code (*codes[3])(int); 5 6 __code CG1(int i){ -> 7 printf("CG1\n"); 8 goto codes[i+1](i+1); 9 } 10 Target 0: (a.out) stopped. (lldb) n CG1 Process 77501 stopped * thread #1, queue = 'com.apple.main-thread', stop reason = step over frame #0: 0x0000000100000e0f a.out`CG1(i=0) at test4.c:8:15 5 6 __code CG1(int i){ 7 printf("CG1\n"); -> 8 goto codes[i+1](i+1); 9 } 10 11 __code CG2(int i){ Target 0: (a.out) stopped. (lldb) s Process 77501 stopped * thread #1, queue = 'com.apple.main-thread', stop reason = step in frame #0: 0x0000000100000e32 a.out`CG1(i=0) at test4.c:9:1 6 __code CG1(int i){ 7 printf("CG1\n"); 8 goto codes[i+1](i+1); -> 9 } 10 11 __code CG2(int i){ 12 printf("CG2\n"); Target 0: (a.out) stopped. (lldb) Process 77501 stopped * thread #1, queue = 'com.apple.main-thread', stop reason = step in frame #0: 0x0000000100000e33 a.out`CG1(i=0) at test4.c:8:8 5 6 __code CG1(int i){ 7 printf("CG1\n"); -> 8 goto codes[i+1](i+1); 9 } 10 11 __code CG2(int i){ Target 0: (a.out) stopped. (lldb) s Process 77501 stopped * thread #1, queue = 'com.apple.main-thread', stop reason = step in frame #0: 0x0000000100000e35 a.out`CG2(i=0) at test4.c:11:18 8 goto codes[i+1](i+1); 9 } 10 -> 11 __code CG2(int i){ 12 printf("CG2\n"); 13 goto codes[i+1](i+1); 14 } Target 0: (a.out) stopped. (lldb) l 15 __code CG3(int i){ 16 printf("CG3\n"); 17 } 18 19 int main(){ 20 codes[0] = CG1; 21 codes[1] = CG2; (lldb) l 22 codes[2] = CG3; 23 goto codes[0](0); 24 } (lldb) l 1 1 #include <stdio.h> 2 #include <stdlib.h> 3 4 __code (*codes[3])(int); 5 6 __code CG1(int i){ 7 printf("CG1\n"); 8 goto codes[i+1](i+1); 9 } 10 (lldb) l 11 __code CG2(int i){ 12 printf("CG2\n"); 13 goto codes[i+1](i+1); 14 } 15 __code CG3(int i){ 16 printf("CG3\n"); 17 } 18 19 int main(){ 20 codes[0] = CG1; (lldb) l 21 codes[1] = CG2; 22 codes[2] = CG3; 23 goto codes[0](0); 24 } (lldb) exit Quitting LLDB will kill one or more processes. Do you really want to proceed: [Y/n] Y ichikitakahiro % pwd /Users/ichikitakahiro/workspace/cr/CbC_log ichikitakahiro % cd .. ichikitakahiro % ls CbC CbC_log Singularity test_space ichikitakahiro % pwd /Users/ichikitakahiro/workspace/cr ichikitakahiro % cd .. ichikitakahiro % ichikitakahiro % cd ~/src/firefly/hg/Gears ichikitakahiro % ls Gears ichikitakahiro % cd Gears ichikitakahiro % ls Dockerfile doc src ichikitakahiro % cd src/parallel_execution ichikitakahiro % ls Atomic.h LockImpl.cbc Stack.h generate_context.pl AtomicReference.cbc MCTaskManagerImpl.cbc SynchronizedQueue.cbc generate_stub.pl AtomicT.h MCTaskManagerImpl.h TaskIterator.cbc helper_cuda.h AtomicTImpl.cbc ModelChecking TaskManager.h helper_string.h AtomicTImpl.h MultiDimIterator.cbc TaskManagerImpl.cbc impl Buffer.h Queue.h Timer.h interface CMakeLists.txt RedBlackTree.agda TimerImpl.cbc lib CPUWorker.cbc RedBlackTree.cbc Todo perlTests CUDAExecutor.cbc RedBlackTreeReWright.cbc Tree.h plautogen CUDAWorker.cbc Semaphore.h Worker.h stack.agda CodeGear.h SemaphoreImpl.cbc cleanup.sh test Executor.h SingleLinkedQueue.cbc compare.c tmp_tool Iterator.h SingleLinkedStack.cbc cuda.c tools Lock.h SpinLock.cbc examples verifier ichikitakahiro % ichikitakahiro % cmake . CMake Warning (dev) in CMakeLists.txt: No project() command is present. The top-level CMakeLists.txt file must contain a literal, direct call to the project() command. Add a line of code such as project(ProjectName) near the top of the file, but after cmake_minimum_required(). CMake is pretending there is a "project(Project)" command on the first line. This warning is for project developers. Use -Wno-dev to suppress it. -- The C compiler identification is AppleClang 11.0.0.11000033 -- The CXX compiler identification is AppleClang 11.0.0.11000033 -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working C compiler: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/cc - skipped -- Detecting C compile features -- Detecting C compile features - done -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Check for working CXX compiler: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ - skipped -- Detecting CXX compile features -- Detecting CXX compile features - done -- Configuring done -- Generating done -- Build files have been written to: /Users/ichikitakahiro/src/firefly/hg/Gears/Gears/src/parallel_execution ichikitakahiro % ls -ltr total 960 -rw-r--r-- 1 ichikitakahiro staff 309 2 12 18:13 Atomic.h -rw-r--r-- 1 ichikitakahiro staff 642 2 12 18:13 AtomicReference.cbc -rw-r--r-- 1 ichikitakahiro staff 238 2 12 18:13 AtomicT.h -rw-r--r-- 1 ichikitakahiro staff 916 2 12 18:13 AtomicTImpl.cbc -rw-r--r-- 1 ichikitakahiro staff 103 2 12 18:13 AtomicTImpl.h -rw-r--r-- 1 ichikitakahiro staff 251 2 12 18:13 Buffer.h -rw-r--r-- 1 ichikitakahiro staff 6746 2 12 18:13 CMakeLists.txt -rw-r--r-- 1 ichikitakahiro staff 4696 2 12 18:13 CPUWorker.cbc -rw-r--r-- 1 ichikitakahiro staff 4805 2 12 18:13 CUDAExecutor.cbc -rw-r--r-- 1 ichikitakahiro staff 5132 2 12 18:13 CUDAWorker.cbc -rw-r--r-- 1 ichikitakahiro staff 357 2 12 18:13 CodeGear.h -rw-r--r-- 1 ichikitakahiro staff 333 2 12 18:13 Executor.h -rw-r--r-- 1 ichikitakahiro staff 366 2 12 18:13 Iterator.h -rw-r--r-- 1 ichikitakahiro staff 193 2 12 18:13 Lock.h -rw-r--r-- 1 ichikitakahiro staff 2893 2 12 18:13 LockImpl.cbc -rw-r--r-- 1 ichikitakahiro staff 9200 2 12 18:13 MCTaskManagerImpl.cbc -rw-r--r-- 1 ichikitakahiro staff 538 2 12 18:13 MCTaskManagerImpl.h drwxr-xr-x 13 ichikitakahiro staff 416 2 12 18:13 ModelChecking -rw-r--r-- 1 ichikitakahiro staff 3331 2 12 18:13 MultiDimIterator.cbc -rw-r--r-- 1 ichikitakahiro staff 336 2 12 18:13 Queue.h -rw-r--r-- 1 ichikitakahiro staff 7889 2 12 18:13 RedBlackTree.agda -rw-r--r-- 1 ichikitakahiro staff 17767 2 12 18:13 RedBlackTree.cbc -rw-r--r-- 1 ichikitakahiro staff 9303 2 12 18:13 RedBlackTreeReWright.cbc -rw-r--r-- 1 ichikitakahiro staff 206 2 12 18:13 Semaphore.h -rw-r--r-- 1 ichikitakahiro staff 1315 2 12 18:13 SemaphoreImpl.cbc -rw-r--r-- 1 ichikitakahiro staff 2521 2 12 18:13 SingleLinkedQueue.cbc -rw-r--r-- 1 ichikitakahiro staff 2326 2 12 18:13 SingleLinkedStack.cbc -rw-r--r-- 1 ichikitakahiro staff 1002 2 12 18:13 SpinLock.cbc -rw-r--r-- 1 ichikitakahiro staff 605 2 12 18:13 Stack.h -rw-r--r-- 1 ichikitakahiro staff 3701 2 12 18:13 SynchronizedQueue.cbc -rw-r--r-- 1 ichikitakahiro staff 1056 2 12 18:13 TaskIterator.cbc -rw-r--r-- 1 ichikitakahiro staff 535 2 12 18:13 TaskManager.h -rw-r--r-- 1 ichikitakahiro staff 8385 2 12 18:13 TaskManagerImpl.cbc -rw-r--r-- 1 ichikitakahiro staff 191 2 12 18:13 Timer.h -rw-r--r-- 1 ichikitakahiro staff 758 2 12 18:13 TimerImpl.cbc -rw-r--r-- 1 ichikitakahiro staff 5668 2 12 18:13 Todo -rw-r--r-- 1 ichikitakahiro staff 362 2 12 18:13 Tree.h -rw-r--r-- 1 ichikitakahiro staff 285 2 12 18:13 Worker.h -rwxr-xr-x 1 ichikitakahiro staff 218 2 12 18:13 cleanup.sh -rw-r--r-- 1 ichikitakahiro staff 274 2 12 18:13 compare.c -rw-r--r-- 1 ichikitakahiro staff 2348 2 12 18:13 cuda.c drwxr-xr-x 13 ichikitakahiro staff 416 2 12 18:13 examples -rw-r--r-- 1 ichikitakahiro staff 18841 2 12 18:13 generate_context.pl -rw-r--r-- 1 ichikitakahiro staff 57387 2 12 18:13 generate_stub.pl -rw-r--r-- 1 ichikitakahiro staff 31897 2 12 18:13 helper_cuda.h -rw-r--r-- 1 ichikitakahiro staff 6048 2 12 18:13 helper_string.h drwxr-xr-x 3 ichikitakahiro staff 96 2 12 18:13 impl drwxr-xr-x 3 ichikitakahiro staff 96 2 12 18:13 interface drwxr-xr-x 3 ichikitakahiro staff 96 2 12 18:13 lib drwxr-xr-x 9 ichikitakahiro staff 288 2 12 18:13 perlTests drwxr-xr-x 4 ichikitakahiro staff 128 2 12 18:13 plautogen -rw-r--r-- 1 ichikitakahiro staff 10583 2 12 18:13 stack.agda drwxr-xr-x 8 ichikitakahiro staff 256 2 12 18:13 test drwxr-xr-x 3 ichikitakahiro staff 96 2 12 18:13 tmp_tool drwxr-xr-x 6 ichikitakahiro staff 192 2 12 18:13 tools drwxr-xr-x 5 ichikitakahiro staff 160 2 12 18:13 verifier -rw-r--r-- 1 ichikitakahiro staff 14368 2 28 14:56 CMakeCache.txt -rw-r--r-- 1 ichikitakahiro staff 104591 2 28 14:56 Makefile -rw-r--r-- 1 ichikitakahiro staff 1651 2 28 14:56 cmake_install.cmake drwxr-xr-x 25 ichikitakahiro staff 800 2 28 14:56 CMakeFiles ichikitakahiro % vim CMakeLists.txt ichikitakahiro % ./cleanup.sh ichikitakahiro % pwd /Users/ichikitakahiro/src/firefly/hg/Gears/Gears/src/parallel_execution ichikitakahiro % cd .. ichikitakahiro % ls CMakeLists.txt include llrb parallel_execution test ichikitakahiro % cd parallel_execution ichikitakahiro % ls examples/ DPP DPPMC boundedBuffer generics_test pop_and_push twice DPP2 bitonicSort calc piposaru sandbox ichikitakahiro % mkdir examples/wc/ ichikitakahiro % vim !$/main.cbc vim examples/wc//main.cbc ichikitakahiro % vim examples/pop_and_push/StackTestImpl.cbc ichikitakahiro % cat Queue.h typedef struct Queue<>{ __code whenEmpty(...); __code clear(Impl* queue, __code next(...)); __code put(Impl* queue, union Data* data, __code next(...)); __code take(Impl* queue, __code next(union Data* data, ...)); __code isEmpty(Impl* queue, __code next(...), __code whenEmpty(...)); __code next(...); } Queue; ichikitakahiro % find . -name Queue ichikitakahiro % find . -name *Queue* find: SingleLinkedQueue.cbc: unknown primary or operator ichikitakahiro % find . -name /*Queue zsh: no matches found: /*Queue ichikitakahiro % find . -name \*Queue.h ./plautogen/impl/SingleLinkedQueue.h ./plautogen/impl/SynchronizedQueue.h ./Queue.h ichikitakahiro % vim SynchronizedQueue.cbc ichikitakahiro % vim examples/twice/main.cbc ichikitakahiro % cp examples/twice/main.cbc examples/wc/main.cbc ichikitakahiro % vim examples/wc/main.cbc ichikitakahiro % make DPP2 CMake Warning (dev) in CMakeLists.txt: No project() command is present. The top-level CMakeLists.txt file must contain a literal, direct call to the project() command. Add a line of code such as project(ProjectName) near the top of the file, but after cmake_minimum_required(). CMake is pretending there is a "project(Project)" command on the first line. This warning is for project developers. Use -Wno-dev to suppress it. -- The C compiler identification is AppleClang 11.0.0.11000033 -- The CXX compiler identification is AppleClang 11.0.0.11000033 -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working C compiler: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/cc - skipped -- Detecting C compile features -- Detecting C compile features - done -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Check for working CXX compiler: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ - skipped -- Detecting CXX compile features -- Detecting CXX compile features - done -- Configuring done -- Generating done -- Build files have been written to: /Users/ichikitakahiro/src/firefly/hg/Gears/Gears/src/parallel_execution [ 11%] Generating c/examples/DPP2/main.c [ 11%] Generating c/AtomicReference.c [ 22%] Generating c/CPUWorker.c [ 22%] Generating c/TaskManagerImpl.c [ 22%] Generating c/SynchronizedQueue.c [ 33%] Generating c/examples/DPP2/AtomicTImpl.c [ 33%] Generating c/SingleLinkedStack.c [WARN] Not found SingleLinkedStack.h at generate_stub.pl line 674. [ 33%] Generating c/examples/DPP2/PhilsImpl.c [ 33%] Generating c/examples/DPP2/ForkImpl.c [ 44%] Generating c/DPP2-context.c Scanning dependencies of target DPP2 [ 44%] Building C object CMakeFiles/DPP2.dir/c/TaskManagerImpl.c.o [ 55%] Building C object CMakeFiles/DPP2.dir/c/CPUWorker.c.o [ 55%] Building C object CMakeFiles/DPP2.dir/c/SynchronizedQueue.c.o [ 55%] Building C object CMakeFiles/DPP2.dir/c/examples/DPP2/AtomicTImpl.c.o [ 66%] Building C object CMakeFiles/DPP2.dir/c/SingleLinkedStack.c.o [ 66%] Building C object CMakeFiles/DPP2.dir/c/examples/DPP2/PhilsImpl.c.o [ 77%] Building C object CMakeFiles/DPP2.dir/c/examples/DPP2/main.c.o [ 77%] Building C object CMakeFiles/DPP2.dir/c/examples/DPP2/ForkImpl.c.o [ 77%] Building C object CMakeFiles/DPP2.dir/ModelChecking/crc32.c.o [ 88%] Building C object CMakeFiles/DPP2.dir/ModelChecking/memory.c.o [ 88%] Building C object CMakeFiles/DPP2.dir/ModelChecking/state_db.c.o [ 88%] Building C object CMakeFiles/DPP2.dir/c/AtomicReference.c.o [100%] Building C object CMakeFiles/DPP2.dir/c/DPP2-context.c.o [100%] Linking C executable DPP2 [100%] Built target DPP2 ichikitakahiro % vim context.h ichikitakahiro % vim examples/wc/wcTarget.h ichikitakahiro % vim examples/wc/main.cbc ichikitakahiro % vim examples/DPP2/main.cbc ichikitakahiro % vim examples/wc/main.cbc ichikitakahiro % pwd /Users/ichikitakahiro/src/firefly/hg/Gears/Gears/src/parallel_execution ichikitakahiro % hg states hg: unknown command 'states' (did you mean one of debugstate, status?) ichikitakahiro % ichikitakahiro % hg status ? src/parallel_execution/.SingleLinkedQueue.cbc.swo ? src/parallel_execution/examples/wc/Wc.h ? src/parallel_execution/examples/wc/WcImpl.cbc ? src/parallel_execution/examples/wc/WcImpl.h ? src/parallel_execution/examples/wc/WcResult.h ? src/parallel_execution/examples/wc/main.cbc ? src/parallel_execution/examples/wc/wcTarget.h ? src/parallel_execution/temp.cbc ichikitakahiro % hg add examples/wc/ adding examples/wc/Wc.h adding examples/wc/WcImpl.cbc adding examples/wc/WcImpl.h adding examples/wc/WcResult.h adding examples/wc/main.cbc adding examples/wc/wcTarget.h ichikitakahiro % hg status A src/parallel_execution/examples/wc/Wc.h A src/parallel_execution/examples/wc/WcImpl.cbc A src/parallel_execution/examples/wc/WcImpl.h A src/parallel_execution/examples/wc/WcResult.h A src/parallel_execution/examples/wc/main.cbc A src/parallel_execution/examples/wc/wcTarget.h ? src/parallel_execution/.SingleLinkedQueue.cbc.swo ? src/parallel_execution/temp.cbc ichikitakahiro % hg commit -m "add wc Example" ichikitakahiro % hg push pushing to ssh://firefly/hg/Gears/Gears searching for changes remote has heads on branch 'default' that are not known locally: a5b36ecbb86e abort: push creates new remote head faa9afc7dd07 (pull and merge or see 'hg help push' for details about pushing new heads) ichikitakahiro % hg pull pulling from ssh://firefly/hg/Gears/Gears searching for changes adding changesets adding manifests adding file changes added 1 changesets with 5 changes to 5 files (+1 heads) new changesets a5b36ecbb86e (run 'hg heads' to see heads, 'hg merge' to merge) ichikitakahiro % hg merge 5 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) ichikitakahiro % hg commit ichikitakahiro % hg push pushing to ssh://firefly/hg/Gears/Gears searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 2 changesets with 6 changes to 6 files ichikitakahiro %