mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 08:50:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

better demo for tmr

Browse source
This commit is contained in:
Peter Cottle 2013-10-26 21:54:12 -07:00
parent 8e5b9b957b
commit 1d7b2bb5a1
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/js/app/index.js
View file

@ -165,14 +165,21 @@ var initDemo = function(sandbox) {
'hg rebase -d master' 'hg rebase -d master'
]; ];
commands = commands.join(';#').split('#'); // hax commands = commands.join(';#').split('#'); // hax
} else if (params.hasOwnProperty('hgdemo3')) { } else if (params.hasOwnProperty('remoteDemo')) {
commands = [ commands = [
'importTreeNow {"branches":{"master":{"target":"C1","id":"master"},"trunk":{"target":"C2","id":"trunk"},"feature":{"target":"C5","id":"feature"},"debug":{"target":"C4","id":"debug"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C3"],"id":"C5"}},"HEAD":{"target":"feature","id":"HEAD"}}', 'git clone',
'hg book', 'git commit',
'delay 2000', 'git fakeTeamwork',
'hg rebase -d trunk' 'git pull',
'git push',
'git commit',
'git fakeTeamwork',
'git pull --rebase',
'git push',
'levels'
]; ];
commands = commands.join(';#').split('#'); // hax commands = commands.join(';#').split('#'); // hax
} else if (!params.hasOwnProperty('NODEMO')) { } else if (!params.hasOwnProperty('NODEMO')) {
commands = [ commands = [
"git help;", "git help;",