Skip to content

Instantly share code, notes, and snippets.

@nikola-bodrozic
Last active March 25, 2018 20:36
Show Gist options
  • Select an option

  • Save nikola-bodrozic/94d6f8fc4d15b61dc41e4d61f912517b to your computer and use it in GitHub Desktop.

Select an option

Save nikola-bodrozic/94d6f8fc4d15b61dc41e4d61f912517b to your computer and use it in GitHub Desktop.
hg branch newfeature && hg ci -m "start feature branch" - create branch
hg update default - switch to default branch
hg merge newfeature - merge newfeature into default
// echo sprintf("<script>console.debug(\"%s --- %s --- %s\");</script>", __FILE__, __METHOD__, $json_encode($array));
hg update -r 500 && hg branch newbranch && hg commit -A -m 'made a new branch from revision 500'
hg add . && hg commit -A -m "alert" && hg push
hg log -l 3
hg incoming -> hg pull -> hg heads -> hg merge -> hg commit -A -m "" -> hg push
hg outgoing
git checkout . | hg revert -C .
| hg revert --rev 2 --all
hg diff -r 3:5 README.md
hg merge pokrece kdiff3
hg vdiff -r 23 -r 24
[extensions]
hgext.extdiff=
[extdiff]
cmd.vdiff = kdiff3
[merge-tools]
kdiff3.args = $base $local $other -o $output
Menu > Run > Edit Configurations
Menu > Settings > Language & Frameworks > PHP > Debug
https://xdebug.org/wizard.php
https://www.youtube.com/watch?v=OlcsQ8TCU3A
usage https://www.youtube.com/watch?v=RiViVMIrbh0
xdebug extensions for firefox and chrome
[xdebug]
zend_extension = /usr/lib/php/20160303/xdebug.so
xdebug.default_enable=1
xdebug.idekey=PHPSTORM
xdebug.remote_enable=1
xdebug.remote_port=9000
xdebug.remote_connect_back=1
------------------------------------------------------
brew install homebrew/php/php71-xdebug
cat /usr/local/etc/php/7.1/conf.d/ext-x-debug.ini
---------------------------------------------------------
hg branch newfeature && hg ci -m "start feature branch" - create branch
hg update default - switch to default branch
hg merge newfeature - merge newfeature into default
hg update -r 500 && hg branch newbranch && hg commit -A -m 'made a new branch from revision 500'
hg add . && hg commit -A -m "alert" && hg push
hg log -l 3
hg incoming -> hg pull -> hg heads -> hg merge -> hg commit -A -m "" -> hg push
hg outgoing
git checkout . | hg revert -C .
| hg revert --rev 2 --all
hg diff -r 3:5 README.md
hg merge pokrece kdiff3
hg vdiff -r 23 -r 24
[extensions]
hgext.extdiff=
[extdiff]
cmd.vdiff = kdiff3
[merge-tools]
kdiff3.args = $base $local $other -o $output
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment