Repository flow { http://optiplex3040/svn/virtuanessrc_x ⇒ http://312archx64d3/git/git-svn-bridge/virtuanessrc_x_bridge.git:master ⇒ http://312archx64d3/git/virtuanessrc_x.git:master ⇒ http://dell2wyse5070/git/virtuanessrc_x.git:master ⇒ br_svn ⇒ http://312archx64d3/git/virtuanessrc_x.git:br_svn ⇒ http://312archx64d3/git/git-svn-bridge/virtuanessrc_x_bridge.git:master ⇒ http://optiplex3040/svn/virtuanessrc_x } 20260131 { # 312archx64d1 cd /home/jin/source git remote -v { origin http://dell2wyse5070/git/virtuanessrc_x.git (fetch) origin http://dell2wyse5070/git/virtuanessrc_x.git (push) } git clone http://dell2wyse5070/git/virtuanessrc_x.git cd virtuanessrc_x git log --oneline --decorate{ 07b7ad6 (HEAD -> master, origin/master, origin/HEAD) Merge branch 'master' of http://dell2wyse5070/git/virtuanessrc_x 9973ed2 compile VirtualNES from ssh ok 903948d add opt binary config bd12e71 add env setting 347ad34 add for txt file config cab29ac add git config 262d109 (origin/br_svn, br_svn) change to svn:eol-style native fb8acfd change to svn:eol-style native be4f559 fix Controller bug ae725d7 add shortcut column e3a85e2 fix Controller bug } git checkout br_svn git cherry-pick cab29ac 347ad34 903948d bd12e71 9973ed2 git log --oneline --decorate{ 0702d35 (HEAD -> br_svn) compile VirtualNES from ssh ok 13b8fbd add env setting 6553bf0 add opt binary config 83c4b58 add for txt file config 652ce4d add git config 262d109 (origin/br_svn) change to svn:eol-style native fb8acfd change to svn:eol-style native be4f559 fix Controller bug ae725d7 add shortcut column } git push origin br_svn # dell2wyse5070 cd /mnt/repo/dell2wyse5070_git/virtuanessrc_x.git git push origin br_svn git push origin --all # 312archx64d3 cd /mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git git remote set-url origin http://312archx64d3/git/virtuanessrc_x.git ### git fetch origin br_svn:master git fetch origin br_svn git checkout master git reset --hard origin/br_svn ### git ⇒ svn git svn dcommit } 20260201{ # 312archx64d3 cd /mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git git svn rebase git push origin master:br_svn --force # 312archx64d1 cd /home/jin/source/312archx64d3_git git clone http://312archx64d3/git/virtuanessrc_x.git cd virtuanessrc_x git switch br_svn git log --oneline --decorate { 868f550 (HEAD -> br_svn, origin/br_svn) change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok 0df7d81 add env setting ... } git switch master git cherry-pick 868f550 { On branch master Your branch is up to date with 'origin/master'. You are currently cherry-picking commit 868f550. (all conflicts fixed: run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) nothing to commit, working tree clean The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use: git commit --allow-empty Otherwise, please use 'git cherry-pick --skip' } git cherry-pick --skip # dell2wyse5070 cd /mnt/repo/dell2wyse5070_git/virtuanessrc_x.git git log br_svn --oneline --decorate { 0702d35 (br_svn) compile VirtualNES from ssh ok 13b8fbd add env setting 6553bf0 add opt binary config 83c4b58 add for txt file config 652ce4d add git config 262d109 change to svn:eol-style native fb8acfd change to svn:eol-style native ... ... } # 312archx64d3 cd /mnt/repo/312archx64d3_git/virtuanessrc_x.git git log br_svn --oneline --decorate { 868f550 (br_svn) change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok 0df7d81 add env setting 341ffb3 add opt binary config 3d0c362 add for txt file config d6ce81d add git config 262d109 change to svn:eol-style native fb8acfd change to svn:eol-style native ... ... } git remote -v { # git remote add dell2wyse5070 http://dell2wyse5070/git/virtuanessrc_x.git dell2wyse5070 http://dell2wyse5070/git/virtuanessrc_x.git (fetch) dell2wyse5070 http://dell2wyse5070/git/virtuanessrc_x.git (push) } git fetch dell2wyse5070 { From http://dell2wyse5070/git/virtuanessrc_x * [new branch] br_svn -> dell2wyse5070/br_svn * [new branch] master -> dell2wyse5070/master } git branch -a { br_svn * master remotes/dell2wyse5070/HEAD -> dell2wyse5070/master remotes/dell2wyse5070/br_svn remotes/dell2wyse5070/master } git push --force-with-lease dell2wyse5070 br_svn:br_svn # dell2wyse5070 cd /mnt/repo/dell2wyse5070_git/virtuanessrc_x.git git log br_svn --oneline --decorate { 868f550 (br_svn) change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok 0df7d81 add env setting 341ffb3 add opt binary config 3d0c362 add for txt file config d6ce81d add git config 262d109 change to svn:eol-style native fb8acfd change to svn:eol-style native ... ... } # 312archx64d1 cd /home/jin/source/virtuanessrc_x git fetch --all git switch master git log --oneline --decorate{ 00d9e8d (HEAD -> master, origin/master, origin/HEAD) add git_history 07b7ad6 Merge branch 'master' of http://dell2wyse5070/git/virtuanessrc_x 9973ed2 compile VirtualNES from ssh ok } git switch br_svn git log --oneline --decorate{ 0702d35 (HEAD -> br_svn) compile VirtualNES from ssh ok 13b8fbd add env setting 6553bf0 add opt binary config } git cherry-pick 00d9e8d { [br_svn 8bad735] add git_history Author: git_jin Date: Sun Feb 1 16:45:23 2026 +0900 1 file changed, 158 insertions(+) create mode 100644 git_history.txt } git log --oneline --decorate{ 8bad735 (HEAD -> br_svn) add git_history 0702d35 compile VirtualNES from ssh ok 13b8fbd add env setting 6553bf0 add opt binary config } git pull --rebase origin br_svn { From http://dell2wyse5070/git/virtuanessrc_x * branch br_svn -> FETCH_HEAD Successfully rebased and updated refs/heads/br_svn. } git push origin br_svn { Enumerating objects: 4, done. Counting objects: 100% (4/4), done. Delta compression using up to 2 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 1.44 KiB | 735.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 To http://dell2wyse5070/git/virtuanessrc_x.git 868f550..18a3092 br_svn -> br_svn } git log --oneline --decorate{ 18a3092 (HEAD -> br_svn, origin/br_svn) add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok 0df7d81 add env setting 341ffb3 add opt binary config } # dell1wyse5070 cd /mnt/repo/dell2wyse5070_git/virtuanessrc_x.git git push origin --all { Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 4 threads Compressing objects: 100% (4/4), done. Writing objects: 100% (4/4), 1.51 KiB | 774.00 KiB/s, done. Total 4 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0) To http://312archx64d3/git/virtuanessrc_x.git 868f550..18a3092 br_svn -> br_svn 07b7ad6..00d9e8d master -> master } # 312archx64d3 cd /mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git git fetch origin br_svn { remote: Enumerating objects: 4, done. remote: Counting objects: 100% (4/4), done. remote: Compressing objects: 100% (3/3), done. remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0) Unpacking objects: 100% (3/3), 1.42 KiB | 80.00 KiB/s, done. From http://312archx64d3/git/virtuanessrc_x * branch br_svn -> FETCH_HEAD 868f550..18a3092 br_svn -> origin/br_svn } git reset --hard origin/br_svn { HEAD is now at 18a3092 add git_history } git svn rebase git svn dcommit { Duplicate specification "id|i=s" for option "i" Committing to http://optiplex3040/svn/virtuanessrc_x ... Authentication realm: svn repos Password for 'jin': A git_history.txt Committed r51 A git_history.txt r51 = fe98c5c61b3c397f01b731813181f77f4b8f9411 (refs/remotes/svn/trunk) No changes between 18a3092870eaed9745597a045dd1be16c59c2978 and refs/remotes/svn/trunk Resetting to the latest refs/remotes/svn/trunk } git svn rebase git push origin master:br_svn --force { Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 2 threads Compressing objects: 100% (4/4), done. Writing objects: 100% (4/4), 1.60 KiB | 818.00 KiB/s, done. Total 4 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0) To http://312archx64d3/git/virtuanessrc_x.git + 18a3092...d7cc240 master -> br_svn (forced update) } cd /mnt/repo/312archx64d3_git/virtuanessrc_x.git git fetch dell2wyse5070 git push --force-with-lease dell2wyse5070 br_svn:br_svn { Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 2 threads Compressing objects: 100% (4/4), done. Writing objects: 100% (4/4), 1.60 KiB | 1.60 MiB/s, done. Total 4 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0) To http://dell2wyse5070/git/virtuanessrc_x.git + 18a3092...d7cc240 br_svn -> br_svn (forced update) ------ [root@dell1wyse5070 virtuanessrc_x.git]# git log br_svn --oneline --decorate 18a3092 (br_svn) add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ... ------ [root@dell1wyse5070 virtuanessrc_x.git]# git log br_svn --oneline --decorate d7cc240 (br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ... } # 312archx64d1 cd /home/jin/source/virtuanessrc_x git remote -v { origin http://dell2wyse5070/git/virtuanessrc_x.git (fetch) origin http://dell2wyse5070/git/virtuanessrc_x.git (push) } git fetch --all { remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (4/4), done. remote: Total 4 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0) Unpacking objects: 100% (4/4), 1.58 KiB | 1.58 MiB/s, done. From http://dell2wyse5070/git/virtuanessrc_x + 18a3092...d7cc240 br_svn -> origin/br_svn (forced update) } git pull --rebase { Successfully rebased and updated refs/heads/br_svn. ------ [jin@312archx64d1 virtuanessrc_x]$ git log --oneline --decorate 18a3092 (HEAD -> br_svn) add git_history 868f550 change to svn:eol-style native ... ------ [jin@312archx64d1 virtuanessrc_x]$ git log --oneline --decorate d7cc240 (HEAD -> br_svn, origin/br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native ... } git switch master { Switched to branch 'master' Your branch is up to date with 'origin/master'. } git cherry-pick d7cc240 { On branch master Your branch is up to date with 'origin/master'. You are currently cherry-picking commit d7cc240. (all conflicts fixed: run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) nothing to commit, working tree clean The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use: git commit --allow-empty Otherwise, please use 'git cherry-pick --skip' } git cherry-pick --skip git pull { Updating 00d9e8d..5c5d8e8 Fast-forward git_history.txt | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) ------ [jin@312archx64d1 virtuanessrc_x]$ git log --oneline --decorate 00d9e8d (HEAD -> master) add git_history 07b7ad6 Merge branch 'master' of http://dell2wyse5070/git/virtuanessrc_x ... ... ------ [jin@312archx64d1 virtuanessrc_x]$ git log --oneline --decorate 5c5d8e8 (HEAD -> master, origin/master, origin/HEAD) add log for add git_history.txt 00d9e8d add git_history 07b7ad6 Merge branch 'master' of http://dell2wyse5070/git/virtuanessrc_x ... ... } git switch br_svn git cherry-pick 5c5d8e8 { [br_svn 928e131] add log for add git_history.txt Author: jin Date: Sun Feb 1 21:58:16 2026 +0900 1 file changed, 183 insertions(+) ------312archx64d1:/home/jin/source/virtuanessrc_x [jin@312archx64d1 virtuanessrc_x]$ git log --oneline --decorate d7cc240 (HEAD -> br_svn, origin/br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ------312archx64d1:/home/jin/source/virtuanessrc_x [jin@312archx64d1 virtuanessrc_x]$ git log --oneline --decorate 928e131 (HEAD -> br_svn) add log for add git_history.txt d7cc240 (origin/br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok } git pull --rebase origin br_svn{ From http://dell2wyse5070/git/virtuanessrc_x * branch br_svn -> FETCH_HEAD Current branch br_svn is up to date. ------ dell1wyse5070:/mnt/repo/dell2wyse5070_git/virtuanessrc_x.git [root@dell1wyse5070 virtuanessrc_x.git]# git log br_svn --oneline --decorate d7cc240 (br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ------ 312archx64d1:/home/jin/source/virtuanessrc_x [jin@312archx64d1 virtuanessrc_x]$ git log --oneline --decorate 928e131 (HEAD -> br_svn) add log for add git_history.txt d7cc240 (origin/br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ------ 312archx64d1:/home/jin/source/virtuanessrc_x [jin@312archx64d1 virtuanessrc_x]$ git log --oneline --decorate 928e131 (HEAD -> br_svn) add log for add git_history.txt d7cc240 (origin/br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok } git push origin br_svn { Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 2 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 2.47 KiB | 2.47 MiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 To http://dell2wyse5070/git/virtuanessrc_x.git d7cc240..928e131 br_svn -> br_svn ------ dell1wyse5070:/mnt/repo/dell2wyse5070_git/virtuanessrc_x.git [root@dell1wyse5070 virtuanessrc_x.git]# git log br_svn --oneline --decorate d7cc240 (br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ------ dell1wyse5070:/mnt/repo/dell2wyse5070_git/virtuanessrc_x.git [root@dell1wyse5070 virtuanessrc_x.git]# git log br_svn --oneline --decorate 928e131 (br_svn) add log for add git_history.txt d7cc240 change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok } # dell1wyse5070 cd /mnt/repo/dell2wyse5070_git/virtuanessrc_x.git git push origin --all { Enumerating objects: 6, done. Counting objects: 100% (6/6), done. Delta compression using up to 4 threads Compressing objects: 100% (4/4), done. Writing objects: 100% (4/4), 2.54 KiB | 1.27 MiB/s, done. Total 4 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0) To http://312archx64d3/git/virtuanessrc_x.git d7cc240..928e131 br_svn -> br_svn 00d9e8d..5c5d8e8 master -> master ------ 312archx64d3:/mnt/repo/312archx64d3_git/virtuanessrc_x.git [root@312archx64d3 virtuanessrc_x.git]# git log br_svn --oneline --decorate d7cc240 (br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ... ... ------ 312archx64d3:/mnt/repo/312archx64d3_git/virtuanessrc_x.git [root@312archx64d3 virtuanessrc_x.git]# git log br_svn --oneline --decorate 928e131 (br_svn) add log for add git_history.txt d7cc240 (dell2wyse5070/br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ... ... [root@312archx64d3 virtuanessrc_x.git]# git log --oneline --decorate 5c5d8e8 (HEAD -> master) add log for add git_history.txt 00d9e8d (dell2wyse5070/master, dell2wyse5070/HEAD) add git_history 07b7ad6 Merge branch 'master' of http://dell2wyse5070/git/virtuanessrc_x 9973ed2 compile VirtualNES from ssh ok } # 312archx64d3 cd /mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git git fetch origin br_svn { remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (3/3), done. remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0) Unpacking objects: 100% (3/3), 2.45 KiB | 278.00 KiB/s, done. From http://312archx64d3/git/virtuanessrc_x * branch br_svn -> FETCH_HEAD d7cc240..928e131 br_svn -> origin/br_svn ------ 312archx64d3:/mnt/repo/312archx64d3_git/virtuanessrc_x.git [root@312archx64d3 virtuanessrc_x.git]# git log br_svn --oneline --decorate 928e131 (br_svn) add log for add git_history.txt d7cc240 (dell2wyse5070/br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git [root@312archx64d3 virtuanessrc_x_bridge.git]# git log --oneline --decorate d7cc240 (HEAD -> master, svn/trunk, origin/br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git [root@312archx64d3 virtuanessrc_x_bridge.git]# git log --oneline --decorate d7cc240 (HEAD -> master, svn/trunk) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok } git reset --hard origin/br_svn { HEAD is now at 928e131 add log for add git_history.txt ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git [root@312archx64d3 virtuanessrc_x_bridge.git]# git log --oneline --decorate d7cc240 (HEAD -> master, svn/trunk) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git [root@312archx64d3 virtuanessrc_x_bridge.git]# git log --oneline --decorate 928e131 (HEAD -> master, origin/br_svn) add log for add git_history.txt d7cc240 (svn/trunk) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok } git svn rebase { Authentication realm: svn repos Password for 'root': Authentication realm: svn repos Username: jin Password for 'jin': Current branch master is up to date. } git svn dcommit { Duplicate specification "id|i=s" for option "i" Committing to http://optiplex3040/svn/virtuanessrc_x ... Authentication realm: svn repos Password for 'jin': M git_history.txt Committed r53 M git_history.txt r53 = 522301e174e1d909ee99c928c40e027346ca6553 (refs/remotes/svn/trunk) No changes between 928e13135444efcd67ee3745542acbd37f901b5b and refs/remotes/svn/trunk } } 20260208{ # 312archx64d1 cd /home/jin/source/virtuanessrc_x git fetch --all git pull git log --oneline --decorate{ d413cdf (HEAD -> master, origin/master, origin/HEAD) set lib for binary 0239a12 app start ok for vc2008 compile 1fde55a fix compile log err 9449d92 fix compile log err 13fdc62 fix include from f01daef _MY_ASM_C_200 for _WIN64 in 201103L 5710a69 compile and run for vc2013 ok e8828b4 64位启动失败调查中 94c8094 LDK_cn.vcproj x64 mode compile ok 0b9567c VirtuaNES_x x64 mode compile ok 5ab1275 git command log for git_history.txt 5c5d8e8 add log for add git_history.txt 00d9e8d add git_history 07b7ad6 Merge branch 'master' of http://dell2wyse5070/git/virtuanessrc_x 9973ed2 compile VirtualNES from ssh ok } git diff 5c5d8e8..5ab1275 > git_log_5ab1275.diff git diff 5ab1275..e8828b4 > vc2008_1_e8828b4.diff # git diff e8828b4..f01daef > vc2013_1_f01daef.diff git diff e8828b4..f01daef -- '*.sln' '*.vcxproj' '*.bat' '*.h' > vc2013_1_f01daef_sln.diff git diff e8828b4..f01daef -- '*.manifest' > vc2013_1_f01daef_manifest.diff git diff f01daef..1fde55a > log_output_1fde55a.diff git diff 1fde55a..0239a12 > vc2008_2_0239a12.diff git diff 0239a12..d413cdf > lib_d413cdf.diff git config --global core.autocrlf false git config --global core.eol lf cd /home/jin/source/312archx64d1_git git clone http://312archx64d1/git/virtuanessrc_x.git virtuanessrc_x1 git clone http://312archx64d1/git/virtuanessrc_x.git virtuanessrc_x2 git clone http://312archx64d1/git/virtuanessrc_x.git virtuanessrc_x3 # virtuanessrc_x1 cp -p /home/jin/source/virtuanessrc_x/vc2008_1_e8828b4.diff ./ cp -p /home/jin/source/virtuanessrc_x/vc2008_2_0239a12.diff ./ cp -p /home/jin/source/virtuanessrc_x/vc2013_1_f01daef_sln.diff ./ cp -p /home/jin/source/virtuanessrc_x/vc2013_1_f01daef_manifest.diff ./ git apply --reject vc2008_1_e8828b4.diff git apply --reject vc2013_1_f01daef_manifest.diff git apply --reject vc2008_2_0239a12.diff git add ldk_095e/vc/vc2008/LDK_cn.vcproj virtuanes/customize.h virtuanes/res/VirtuaNES.exe.manifest virtuanes/vc/vc2008/VirtuaNES_x.sln virtuanes/vc/vc2008/VirtuaNES_x.vcproj git commit -m "compile and run for vc2008 ok" git apply --reject vc2013_1_f01daef_sln.diff git add ldk_095e/vc/vc2013/LDK_cn.vcxproj upxLdk.bat upxVirtuaNES.bat virtuanes/customize.h virtuanes/vc/vc2013/VirtuaNES_x.sln virtuanes/vc/vc2013/VirtuaNES_x.vcxproj git commit -m "compile and run for vc2013 ok" # virtuanessrc_x2 cp -p /home/jin/source/virtuanessrc_x/lib_d413cdf.diff ./ git apply --reject lib_d413cdf.diff git add .gitattributes git commit -m "set lib for binary" # virtuanessrc_x3 cp -p /home/jin/source/virtuanessrc_x/log_output_1fde55a.diff ./ git apply --reject log_output_1fde55a.diff git add ldk_095e/LDK_cn.cpp virtuanes/customize.h virtuanes/log/ComLog.h virtuanes/log/log2.cpp git commit -m "fix compile log err" git config --global pull.rebase false # virtuanessrc_x1 git pull git push # virtuanessrc_x2 git pull --no-rebase git push # virtuanessrc_x3 git pull --no-rebase git push cp -p /home/jin/source/virtuanessrc_x/git_log_5ab1275.diff ./ git apply --reject git_log_5ab1275.diff git add git_history.txt git commit -m "log for git_history.txt" git pull --no-rebase git push git log --oneline --decorate { d91a775 (HEAD -> master, origin/master, origin/HEAD) log for git_history.txt 4669e3f Merge branch 'master' of http://312archx64d1/git/virtuanessrc_x fd444fa Merge branch 'master' of http://312archx64d1/git/virtuanessrc_x 0445592 fix compile log err 52a9079 set lib for binary 1446527 compile and run for vc2013 ok 23e5f27 compile and run for vc2008 ok 5c5d8e8 add log for add git_history.txt 00d9e8d add git_history 07b7ad6 Merge branch 'master' of http://dell2wyse5070/git/virtuanessrc_x 9973ed2 compile VirtualNES from ssh ok } git checkout br_svn git log br_svn --oneline --decorate { 928e131 (HEAD -> br_svn, origin/br_svn) add log for add git_history.txt d7cc240 change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok } git cherry-pick 23e5f27 1446527 52a9079 0445592 d91a775 { [br_svn d6355c3] compile and run for vc2008 ok Date: Sun Feb 8 12:16:39 2026 +0900 5 files changed, 486 insertions(+), 55 deletions(-) [br_svn d6ff8bc] compile and run for vc2013 ok Date: Sun Feb 8 12:45:28 2026 +0900 6 files changed, 312 insertions(+), 29 deletions(-) [br_svn 5a960b7] set lib for binary Date: Sun Feb 8 15:09:17 2026 +0900 1 file changed, 1 insertion(+) Auto-merging virtuanes/customize.h [br_svn 536cb9a] fix compile log err Date: Sun Feb 8 15:15:55 2026 +0900 4 files changed, 4 insertions(+), 5 deletions(-) [br_svn 3b8ce6c] log for git_history.txt Date: Sun Feb 8 15:39:09 2026 +0900 1 file changed, 189 insertions(+) ------312archx64d1:/home/jin/source/312archx64d1_git/virtuanessrc_x3 git log br_svn --oneline --decorate 928e131 (HEAD -> br_svn, origin/br_svn) add log for add git_history.txt d7cc240 change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ------312archx64d1:/home/jin/source/312archx64d1_git/virtuanessrc_x3 [jin@312archx64d1 virtuanessrc_x]$ git log --oneline --decorate 3b8ce6c (HEAD -> br_svn) log for git_history.txt 536cb9a fix compile log err 5a960b7 set lib for binary d6ff8bc compile and run for vc2013 ok d6355c3 compile and run for vc2008 ok 928e131 (origin/br_svn) add log for add git_history.txt d7cc240 change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok } git push origin br_svn cd /mnt/repo/312archx64d1_git/virtuanessrc_x.git git push origin --all cd /mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git git fetch origin br_svn git reset --hard origin/br_svn{ HEAD is now at 3b8ce6c log for git_history.txt ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git [root@312archx64d3 virtuanessrc_x_bridge.git]# git log --oneline --decorate 522301e (HEAD -> master, svn/trunk) add log for add git_history.txt d7cc240 change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok 0df7d81 add env setting 341ffb3 add opt binary config 3d0c362 add for txt file config d6ce81d add git config 262d109 (origin/master) change to svn:eol-style native fb8acfd change to svn:eol-style native be4f559 fix Controller bug ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git 3b8ce6c (HEAD -> master, origin/br_svn) log for git_history.txt 536cb9a fix compile log err 5a960b7 set lib for binary d6ff8bc compile and run for vc2013 ok d6355c3 compile and run for vc2008 ok 928e131 add log for add git_history.txt d7cc240 change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok 0df7d81 add env setting 341ffb3 add opt binary config 3d0c362 add for txt file config d6ce81d add git config 262d109 (origin/master) change to svn:eol-style native fb8acfd change to svn:eol-style native be4f559 fix Controller bug } git svn rebase { Authentication realm: svn repos Password for 'jin': warning: skipped previously applied commit 928e131 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config set advice.skippedCherryPicks false" Successfully rebased and updated refs/heads/master. ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git [root@312archx64d3 virtuanessrc_x_bridge.git]# git log --oneline --decorate 3b8ce6c (HEAD -> master, origin/br_svn) log for git_history.txt 536cb9a fix compile log err 5a960b7 set lib for binary d6ff8bc compile and run for vc2013 ok d6355c3 compile and run for vc2008 ok 928e131 add log for add git_history.txt d7cc240 change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok 0df7d81 add env setting 341ffb3 add opt binary config 3d0c362 add for txt file config d6ce81d add git config 262d109 (origin/master) change to svn:eol-style native fb8acfd change to svn:eol-style native be4f559 fix Controller bug ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git [root@312archx64d3 virtuanessrc_x_bridge.git]# git log --oneline --decorate 5e1eeac (HEAD -> master) log for git_history.txt 0702ad0 fix compile log err fcf89fa set lib for binary a1fb9d9 compile and run for vc2013 ok 221f35f compile and run for vc2008 ok 522301e (svn/trunk) add log for add git_history.txt d7cc240 change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok 0df7d81 add env setting 341ffb3 add opt binary config 3d0c362 add for txt file config d6ce81d add git config 262d109 (origin/master) change to svn:eol-style native fb8acfd change to svn:eol-style native be4f559 fix Controller bug } git svn dcommit { ------ Duplicate specification "id|i=s" for option "i" Committing to http://optiplex3040/svn/virtuanessrc_x ... Authentication realm: svn repos Password for 'jin': M ldk_095e/vc/vc2008/LDK_cn.vcproj M virtuanes/customize.h M virtuanes/res/VirtuaNES.exe.manifest M virtuanes/vc/vc2008/VirtuaNES_x.sln M virtuanes/vc/vc2008/VirtuaNES_x.vcproj Committed r54 M ldk_095e/vc/vc2008/LDK_cn.vcproj M virtuanes/customize.h M virtuanes/res/VirtuaNES.exe.manifest M virtuanes/vc/vc2008/VirtuaNES_x.sln M virtuanes/vc/vc2008/VirtuaNES_x.vcproj r54 = 16521e7208853913529e1bc057ed0fac2ea37749 (refs/remotes/svn/trunk) M ldk_095e/vc/vc2013/LDK_cn.vcxproj M upxLdk.bat M upxVirtuaNES.bat M virtuanes/customize.h M virtuanes/vc/vc2013/VirtuaNES_x.sln M virtuanes/vc/vc2013/VirtuaNES_x.vcxproj Committed r55 M ldk_095e/vc/vc2013/LDK_cn.vcxproj M upxLdk.bat M upxVirtuaNES.bat M virtuanes/customize.h M virtuanes/vc/vc2013/VirtuaNES_x.sln M virtuanes/vc/vc2013/VirtuaNES_x.vcxproj r55 = a55245e45eb6a491d396ef6e53745838a23cbb41 (refs/remotes/svn/trunk) M .gitattributes Committed r56 M .gitattributes r56 = 848df21078e7d415d1caca04d8a6b763d8e7ce5e (refs/remotes/svn/trunk) M ldk_095e/LDK_cn.cpp M virtuanes/customize.h M virtuanes/log/ComLog.h M virtuanes/log/log2.cpp Committed r57 M ldk_095e/LDK_cn.cpp M virtuanes/customize.h M virtuanes/log/ComLog.h M virtuanes/log/log2.cpp r57 = 9fbab7f4acbd39f6861d3f6509897a8cea18f8c8 (refs/remotes/svn/trunk) M git_history.txt Committed r58 M git_history.txt r58 = 35976735fc8334bca51c5ea4b2014b80f4a73411 (refs/remotes/svn/trunk) No changes between 5e1eeac72f750ca40078554f19bdd7afbd8403c5 and refs/remotes/svn/trunk Resetting to the latest refs/remotes/svn/trunk ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git [root@312archx64d3 virtuanessrc_x_bridge.git]# git log --oneline --decorate 5e1eeac (HEAD -> master) log for git_history.txt 0702ad0 fix compile log err fcf89fa set lib for binary a1fb9d9 compile and run for vc2013 ok 221f35f compile and run for vc2008 ok 522301e (svn/trunk) add log for add git_history.txt d7cc240 change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok 0df7d81 add env setting 341ffb3 add opt binary config 3d0c362 add for txt file config d6ce81d add git config 262d109 (origin/master) change to svn:eol-style native fb8acfd change to svn:eol-style native be4f559 fix Controller bug ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git 3597673 (HEAD -> master, svn/trunk) log for git_history.txt 9fbab7f fix compile log err 848df21 set lib for binary a55245e compile and run for vc2013 ok 16521e7 compile and run for vc2008 ok 522301e add log for add git_history.txt d7cc240 change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok 0df7d81 add env setting 341ffb3 add opt binary config 3d0c362 add for txt file config d6ce81d add git config 262d109 (origin/master) change to svn:eol-style native fb8acfd change to svn:eol-style native be4f559 fix Controller bug } git svn rebase git push origin master:br_svn --force { ------ Enumerating objects: 71, done. Counting objects: 100% (71/71), done. Delta compression using up to 2 threads Compressing objects: 100% (46/46), done. Writing objects: 100% (46/46), 8.94 KiB | 915.00 KiB/s, done. Total 46 (delta 32), reused 0 (delta 0), pack-reused 0 (from 0) To http://312archx64d3/git/virtuanessrc_x.git + 3b8ce6c...3597673 master -> br_svn (forced update) ------ 312archx64d3:/mnt/repo/312archx64d3_git/virtuanessrc_x.git 3b8ce6c (br_svn) log for git_history.txt 536cb9a fix compile log err 5a960b7 set lib for binary d6ff8bc compile and run for vc2013 ok d6355c3 compile and run for vc2008 ok 928e131 add log for add git_history.txt d7cc240 (dell2wyse5070/br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok ------ 312archx64d3:/mnt/repo/312archx64d3_git/virtuanessrc_x.git 3597673 (br_svn) log for git_history.txt 9fbab7f fix compile log err 848df21 set lib for binary a55245e compile and run for vc2013 ok 16521e7 compile and run for vc2008 ok 522301e add log for add git_history.txt d7cc240 (dell2wyse5070/br_svn) change to svn:eol-style native fe98c5c add git_history 868f550 change to svn:eol-style native d3430b6 compile VirtualNES from ssh ok } cd /mnt/repo/312archx64d3_git/virtuanessrc_x.git git remote -v git push dell2wyse5070 --all --force { Enumerating objects: 106, done. Counting objects: 100% (83/83), done. Delta compression using up to 2 threads Compressing objects: 100% (56/56), done. Writing objects: 100% (56/56), 8.52 KiB | 727.00 KiB/s, done. Total 56 (delta 37), reused 0 (delta 0), pack-reused 0 (from 0) To http://dell2wyse5070/git/virtuanessrc_x.git + 57dc866...3597673 br_svn -> br_svn (forced update) + d413cdf...d91a775 master -> master (forced update) } # dell1wyse5070 cd /mnt/repo/dell2wyse5070_git/virtuanessrc_x.git git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" git fetch origin } 20260216{ # 312archx64d1 cd /home/jin/source cd virtuanessrc_x git fetch --all git reset --hard origin/master git log --oneline --decorate { b8b9de4 (HEAD -> master, origin/master, origin/HEAD) fix crlf for move_log.js aae4912 Merge branch 'master' of http://dell2wyse5070/git/virtuanessrc_x 09ee750 compile for dinput8.lib ok d3f4045 add vc version to compile_info 9a2c6ac add log && fix bin_path a97425c add js tools && del lib file d91a775 log for git_history.txt 4669e3f Merge branch 'master' of http://312archx64d1/git/virtuanessrc_x fd444fa Merge branch 'master' of http://312archx64d1/git/virtuanessrc_x } git checkout br_svn { branch 'br_svn' set up to track 'origin/br_svn'. Switched to a new branch 'br_svn' } git log --oneline --decorate { 3597673 (HEAD -> br_svn, origin/br_svn) log for git_history.txt 9fbab7f fix compile log err 848df21 set lib for binary } git cherry-pick a97425c 9a2c6ac d3f4045 09ee750 b8b9de4 { [br_svn f1c38d4] add js tools && del lib file Author: jin Date: Sun Feb 8 21:33:15 2026 +0900 4 files changed, 2172 insertions(+), 3 deletions(-) create mode 100644 tools/virtuane_js/compile_virtuane.js create mode 100644 tools/virtuane_js/move_log.js create mode 100644 tools/virtuane_js/term_com.js [br_svn 49a8fc0] add log && fix bin_path Author: jin Date: Sun Feb 8 22:50:00 2026 +0900 2 files changed, 398 insertions(+), 7 deletions(-) [br_svn dc27e60] add vc version to compile_info Author: jin Date: Mon Feb 9 22:37:12 2026 +0900 1 file changed, 6 insertions(+), 6 deletions(-) [br_svn 031ad3f] compile for dinput8.lib ok Author: git_jin Date: Mon Feb 9 22:40:57 2026 +0900 6 files changed, 200 insertions(+), 173 deletions(-) create mode 100644 virtuanes/directx/x64/dinput8.lib create mode 100644 virtuanes/directx/x86/dinput8.lib error: Your local changes to the following files would be overwritten by merge: tools/virtuane_js/move_log.js Please commit your changes or stash them before you merge. Aborting fatal: cherry-pick failed } vim .gitattributes { ... **.js text ⇒ ## **.js text ... } git restore tools/virtuane_js/move_log.js git cherry-pick b8b9de4 { [br_svn 42f348c] fix crlf for move_log.js Author: jin Date: Sun Feb 15 23:55:40 2026 +0900 1 file changed, 2 insertions(+), 2 deletions(-) } vim .gitattributes { ... ## **.js text ⇒ **.js text ... } git log --oneline --decorate { 42f348c (HEAD -> br_svn) fix crlf for move_log.js 031ad3f compile for dinput8.lib ok dc27e60 add vc version to compile_info 49a8fc0 add log && fix bin_path f1c38d4 add js tools && del lib file 3597673 (origin/br_svn) log for git_history.txt 9fbab7f fix compile log err 848df21 set lib for binary } git push origin br_svn { Enumerating objects: 51, done. Counting objects: 100% (51/51), done. Delta compression using up to 2 threads Compressing objects: 100% (27/27), done. Writing objects: 100% (38/38), 127.57 KiB | 42.52 MiB/s, done. Total 38 (delta 18), reused 20 (delta 7), pack-reused 0 To http://dell2wyse5070/git/virtuanessrc_x.git 3597673..42f348c br_svn -> br_svn } # dell2wyse5070 cd /mnt/repo/dell2wyse5070_git/virtuanessrc_x.git git log --oneline --decorate { b8b9de4 (HEAD -> master) fix crlf for move_log.js aae4912 Merge branch 'master' of http://dell2wyse5070/git/virtuanessrc_x 09ee750 compile for dinput8.lib ok d3f4045 add vc version to compile_info 9a2c6ac add log && fix bin_path a97425c add js tools && del lib file d91a775 (origin/master, origin/HEAD) log for git_history.txt 4669e3f Merge branch 'master' of http://312archx64d1/git/virtuanessrc_x fd444fa Merge branch 'master' of http://312archx64d1/git/virtuanessrc_x } git log br_svn --oneline --decorate { 42f348c (br_svn) fix crlf for move_log.js 031ad3f compile for dinput8.lib ok dc27e60 add vc version to compile_info 49a8fc0 add log && fix bin_path f1c38d4 add js tools && del lib file 3597673 (origin/br_svn) log for git_history.txt 9fbab7f fix compile log err } git push origin --all { Enumerating objects: 58, done. Counting objects: 100% (58/58), done. Delta compression using up to 4 threads Compressing objects: 100% (41/41), done. Writing objects: 100% (45/45), 128.25 KiB | 1.49 MiB/s, done. Total 45 (delta 23), reused 0 (delta 0), pack-reused 0 (from 0) To http://312archx64d3/git/virtuanessrc_x.git 3597673..42f348c br_svn -> br_svn d91a775..b8b9de4 master -> master ------ git log --oneline --decorate b8b9de4 (HEAD -> master, origin/master, origin/HEAD) fix crlf for move_log.js aae4912 Merge branch 'master' of http://dell2wyse5070/git/virtuanessrc_x 09ee750 compile for dinput8.lib ok d3f4045 add vc version to compile_info 9a2c6ac add log && fix bin_path a97425c add js tools && del lib file d91a775 log for git_history.txt 4669e3f Merge branch 'master' of http://312archx64d1/git/virtuanessrc_x fd444fa Merge branch 'master' of http://312archx64d1/git/virtuanessrc_x ------ git log br_svn --oneline --decorate 42f348c (origin/br_svn, br_svn) fix crlf for move_log.js 031ad3f compile for dinput8.lib ok dc27e60 add vc version to compile_info 49a8fc0 add log && fix bin_path f1c38d4 add js tools && del lib file 3597673 log for git_history.txt 9fbab7f fix compile log err } # 312archx64d3 cd /mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git # git remote set-url origin http://312archx64d3/git/virtuanessrc_x.git git remote -v { origin http://312archx64d3/git/virtuanessrc_x.git (fetch) origin http://312archx64d3/git/virtuanessrc_x.git (push) } git fetch origin br_svn { remote: Enumerating objects: 51, done. remote: Counting objects: 100% (51/51), done. remote: Compressing objects: 100% (34/34), done. remote: Total 38 (delta 18), reused 0 (delta 0), pack-reused 0 (from 0) Unpacking objects: 100% (38/38), 127.53 KiB | 801.00 KiB/s, done. From http://312archx64d3/git/virtuanessrc_x * branch br_svn -> FETCH_HEAD 3597673..42f348c br_svn -> origin/br_svn ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git [root@312archx64d3 virtuanessrc_x_bridge.git]# git log --oneline --decorate 3597673 (HEAD -> master, svn/trunk, origin/br_svn) log for git_history.txt 9fbab7f fix compile log err ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git [root@312archx64d3 virtuanessrc_x_bridge.git]# git log --oneline --decorate 3597673 (HEAD -> master, svn/trunk) log for git_history.txt 9fbab7f fix compile log err } git reset --hard origin/br_svn { HEAD is now at 42f348c fix crlf for move_log.js ------ 312archx64d3:/mnt/repo/312archx64d3_git/virtuanessrc_x.git [root@312archx64d3 virtuanessrc_x.git]# git log br_svn --oneline --decorate 42f348c (br_svn) fix crlf for move_log.js 031ad3f compile for dinput8.lib ok dc27e60 add vc version to compile_info 49a8fc0 add log && fix bin_path f1c38d4 add js tools && del lib file 3597673 (dell2wyse5070/br_svn) log for git_history.txt 9fbab7f fix compile log err 848df21 set lib for binary ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git [root@312archx64d3 virtuanessrc_x_bridge.git]# git log --oneline --decorate 3597673 (HEAD -> master, svn/trunk) log for git_history.txt 9fbab7f fix compile log err ------ 312archx64d3:/mnt/repo/312archx64d3_git/git-svn-bridge/virtuanessrc_x_bridge.git [root@312archx64d3 virtuanessrc_x_bridge.git]# git log --oneline --decorate 42f348c (HEAD -> master, origin/br_svn) fix crlf for move_log.js 031ad3f compile for dinput8.lib ok dc27e60 add vc version to compile_info 49a8fc0 add log && fix bin_path f1c38d4 add js tools && del lib file 3597673 (svn/trunk) log for git_history.txt 9fbab7f fix compile log err } git svn rebase { Authentication realm: svn repos Password for 'jin': Current branch master is up to date. } git svn dcommit { Duplicate specification "id|i=s" for option "i" Committing to http://optiplex3040/svn/virtuanessrc_x ... Authentication realm: svn repos Password for 'jin': A tools/virtuane_js/compile_virtuane.js A tools/virtuane_js/move_log.js A tools/virtuane_js/term_com.js M delbin.bat Committed r59 M delbin.bat A tools/virtuane_js/compile_virtuane.js A tools/virtuane_js/move_log.js A tools/virtuane_js/term_com.js r59 = 9f3d28f2e2941c2449fec8a70eccf012e8fc0624 (refs/remotes/svn/trunk) M git_history.txt M tools/virtuane_js/compile_virtuane.js Committed r60 M git_history.txt M tools/virtuane_js/compile_virtuane.js r60 = 3811e7aa7e02105ffa14643df93c556bf5783802 (refs/remotes/svn/trunk) M tools/virtuane_js/compile_virtuane.js Committed r61 M tools/virtuane_js/compile_virtuane.js r61 = 754152b211da39a9c13fe7fde3b554c668d00de8 (refs/remotes/svn/trunk) A virtuanes/directx/x64/dinput8.lib A virtuanes/directx/x86/dinput8.lib M virtuanes/directx/x64/dsound.h M virtuanes/directx/x86/dsound.h M virtuanes/vc/vc2008/VirtuaNES_x.vcproj M virtuanes/vc/vc2013/VirtuaNES_x.vcxproj Committed r62 A virtuanes/directx/x64/dinput8.lib M virtuanes/directx/x64/dsound.h A virtuanes/directx/x86/dinput8.lib M virtuanes/directx/x86/dsound.h M virtuanes/vc/vc2008/VirtuaNES_x.vcproj M virtuanes/vc/vc2013/VirtuaNES_x.vcxproj r62 = 5f2e6e3637e06365f6bfd677d10af123ac27a327 (refs/remotes/svn/trunk) M tools/virtuane_js/move_log.js Committed r63 M tools/virtuane_js/move_log.js r63 = 0298d91fbdb54b1cb3b54816b9f38d9d582cd91b (refs/remotes/svn/trunk) No changes between 42f348cc6d2d20b306816f630036b520ed31a6f7 and refs/remotes/svn/trunk Resetting to the latest refs/remotes/svn/trunk } git svn rebase git push origin master:br_svn --force { Enumerating objects: 51, done. Counting objects: 100% (51/51), done. Delta compression using up to 2 threads Compressing objects: 100% (34/34), done. Writing objects: 100% (38/38), 127.79 KiB | 4.12 MiB/s, done. Total 38 (delta 18), reused 0 (delta 0), pack-reused 0 (from 0) To http://312archx64d3/git/virtuanessrc_x.git + 42f348c...0298d91 master -> br_svn (forced update) ------ 312archx64d3:/mnt/repo/312archx64d3_git/virtuanessrc_x.git [root@312archx64d3 virtuanessrc_x.git]# git log br_svn --oneline --decorate 42f348c (br_svn) fix crlf for move_log.js 031ad3f compile for dinput8.lib ok dc27e60 add vc version to compile_info 49a8fc0 add log && fix bin_path f1c38d4 add js tools && del lib file 3597673 (dell2wyse5070/br_svn) log for git_history.txt 9fbab7f fix compile log err 848df21 set lib for binary a55245e compile and run for vc2013 ok 16521e7 compile and run for vc2008 ok ------ 312archx64d3:/mnt/repo/312archx64d3_git/virtuanessrc_x.git [root@312archx64d3 virtuanessrc_x.git]# git log br_svn --oneline --decorate 0298d91 (br_svn) fix crlf for move_log.js 5f2e6e3 compile for dinput8.lib ok 754152b add vc version to compile_info 3811e7a add log && fix bin_path 9f3d28f add js tools && del lib file 3597673 (dell2wyse5070/br_svn) log for git_history.txt 9fbab7f fix compile log err 848df21 set lib for binary a55245e compile and run for vc2013 ok 16521e7 compile and run for vc2008 ok } cd /mnt/repo/312archx64d3_git/virtuanessrc_x.git git fetch dell2wyse5070 { From http://dell2wyse5070/git/virtuanessrc_x 3597673..42f348c br_svn -> dell2wyse5070/br_svn d91a775..b8b9de4 master -> dell2wyse5070/master ------ 312archx64d3:/mnt/repo/312archx64d3_git/virtuanessrc_x.git [root@312archx64d3 virtuanessrc_x.git]# git log br_svn --oneline --decorate 0298d91 (br_svn) fix crlf for move_log.js 5f2e6e3 compile for dinput8.lib ok 754152b add vc version to compile_info 3811e7a add log && fix bin_path 9f3d28f add js tools && del lib file 3597673 (dell2wyse5070/br_svn) log for git_history.txt 9fbab7f fix compile log err 848df21 set lib for binary ------ 312archx64d3:/mnt/repo/312archx64d3_git/virtuanessrc_x.git [root@312archx64d3 virtuanessrc_x.git]# git log br_svn --oneline --decorate 0298d91 (br_svn) fix crlf for move_log.js 5f2e6e3 compile for dinput8.lib ok 754152b add vc version to compile_info 3811e7a add log && fix bin_path 9f3d28f add js tools && del lib file 3597673 log for git_history.txt 9fbab7f fix compile log err 848df21 set lib for binary } git push --force-with-lease dell2wyse5070 br_svn:br_svn { Enumerating objects: 51, done. Counting objects: 100% (51/51), done. Delta compression using up to 2 threads Compressing objects: 100% (34/34), done. Writing objects: 100% (38/38), 127.79 KiB | 3.99 MiB/s, done. Total 38 (delta 18), reused 0 (delta 0), pack-reused 0 (from 0) To http://dell2wyse5070/git/virtuanessrc_x.git + 42f348c...0298d91 br_svn -> br_svn (forced update) ------ dell2wyse5070:/mnt/repo/dell2wyse5070_git/virtuanessrc_x.git [root@dell2wyse5070 virtuanessrc_x.git]# git log br_svn --oneline --decorate 42f348c (origin/br_svn, br_svn) fix crlf for move_log.js 031ad3f compile for dinput8.lib ok dc27e60 add vc version to compile_info 49a8fc0 add log && fix bin_path f1c38d4 add js tools && del lib file 3597673 log for git_history.txt 9fbab7f fix compile log err 848df21 set lib for binary ... ------ dell2wyse5070:/mnt/repo/dell2wyse5070_git/virtuanessrc_x.git [root@dell2wyse5070 virtuanessrc_x.git]# git log br_svn --oneline --decorate 0298d91 (br_svn) fix crlf for move_log.js 5f2e6e3 compile for dinput8.lib ok 754152b add vc version to compile_info 3811e7a add log && fix bin_path 9f3d28f add js tools && del lib file 3597673 log for git_history.txt 9fbab7f fix compile log err 848df21 set lib for binary ... } }