{"id":8,"date":"2009-11-01T16:46:01","date_gmt":"2009-11-01T14:46:01","guid":{"rendered":"http:\/\/www.nerdhead.de\/blog\/?p=8"},"modified":"2019-05-13T16:10:22","modified_gmt":"2019-05-13T14:10:22","slug":"mercurial","status":"publish","type":"post","link":"https:\/\/www.nerdhead.de\/blog\/2009\/11\/01\/mercurial\/","title":{"rendered":"Mercurial (hg) Dezentrale Versionsverwaltung"},"content":{"rendered":"

In der .hgrc<\/em> im Home-Dir des Users folgendes eintragen.
\n
\n[ui]
\nusername = Vorname Nachname <e-mail@address>
\n[extensions]
\nhgext.extdiff =<\/code><\/p>\n

[extdiff]
\ncmd.opendiff = fmdiff<\/code><\/p>\n

[merge-tools]
\nfilemerge.executable = fmmerge
\nfilemerge.args = $local $other -ancestor $base -merge $output<\/code><\/p>\n

Das fmdiff<\/em> Script kann hier<\/a> gefunden werden. Das Script wird als Wrapper f\u00fcr die FileMerge.app<\/em> benutzt welche unter Mac OS X ein sch\u00f6nes grafisches Diff- und Merge-Tools ist. Mit dem Befehl hg opendiff <Dateiname><\/em> wird das externe Diff-Tool gestartet.<\/p>\n

F\u00fcr Mac OS X und XCode empfiehlt sich noch folgende .hgignore<\/em> Datei um nur die Source-Codes und nicht die Binaries ein zu checken:
\n
\nsyntax: glob
\n# This line is a comment, and will be skipped.
\n# Empty lines are skipped too.
\n# Backup files left behind by the Emacs editor.
\n*~
\n# Lock files used by the Emacs editor.
\n# Notice that the \"#\" character is quoted with a backslash.
\n# This prevents it from being interpreted as starting a comment.
\n.\\#*
\n# Temporary files used by the vim editor.
\n.*.swp
\n# A hidden file created by the Mac OS X Finder.
\n.DS_Store
\n# ignore Xcode specific files and direcotry
\n*.swp
\n*~.nib
\nbuild
\n*.pbxuser
\n*.perspective
\n*.perspectivev3
\n<\/code><\/p>\n

Eine sehr gute Anleitung zu Mercurial ist im\u00a0Mercurial: The Definitive Guide<\/a> zu finden und die Mercurial-Homepage<\/a> h\u00e4lt auch immer gute Informationen und nat\u00fcrlich die neusten Versionen bereit.<\/p>\n","protected":false},"excerpt":{"rendered":"

In der .hgrc im Home-Dir des Users folgendes eintragen. [ui] username = Vorname Nachname <e-mail@address> [extensions] hgext.extdiff = [extdiff] cmd.opendiff = fmdiff [merge-tools] filemerge.executable = fmmerge filemerge.args = $local $other -ancestor $base -merge $output Das fmdiff Script kann hier gefunden … Continue reading →<\/span><\/a><\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[5,6],"tags":[17,18],"class_list":["post-8","post","type-post","status-publish","format-standard","hentry","category-development","category-howto","tag-development","tag-howto"],"_links":{"self":[{"href":"https:\/\/www.nerdhead.de\/blog\/wp-json\/wp\/v2\/posts\/8","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.nerdhead.de\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.nerdhead.de\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.nerdhead.de\/blog\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/www.nerdhead.de\/blog\/wp-json\/wp\/v2\/comments?post=8"}],"version-history":[{"count":12,"href":"https:\/\/www.nerdhead.de\/blog\/wp-json\/wp\/v2\/posts\/8\/revisions"}],"predecessor-version":[{"id":78,"href":"https:\/\/www.nerdhead.de\/blog\/wp-json\/wp\/v2\/posts\/8\/revisions\/78"}],"wp:attachment":[{"href":"https:\/\/www.nerdhead.de\/blog\/wp-json\/wp\/v2\/media?parent=8"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.nerdhead.de\/blog\/wp-json\/wp\/v2\/categories?post=8"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.nerdhead.de\/blog\/wp-json\/wp\/v2\/tags?post=8"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}