{"id":543,"date":"2013-02-20T10:03:16","date_gmt":"2013-02-20T10:03:16","guid":{"rendered":"http:\/\/blog.bachi.net\/?p=543"},"modified":"2015-11-18T12:59:53","modified_gmt":"2015-11-18T12:59:53","slug":"subversion-keywords","status":"publish","type":"post","link":"https:\/\/blog.bachi.net\/?p=543","title":{"rendered":"Subversion"},"content":{"rendered":"

Video-Tutorial<\/h3>\n

Software Carpentry – Version Control with Subversion<\/a><\/p>\n

General<\/h3>\n

What do \u201cbranch\u201d, \u201ctag\u201d and \u201ctrunk\u201d mean in Subversion repositories?<\/a>
\nWhat is trunk, branch and tag in Subversion?<\/a><\/p>\n

Externals<\/h3>\n

Externals Definitions<\/a>
\nAdding an External Repository to an SVN Project<\/a><\/p>\n

Properties \/ Eigenschaften<\/h3>\n

Eigenschaften<\/a><\/p>\n

\r\n$ svn proplist -v .\r\n$ svn propset <name> <value>\r\n$ svn propedit\r\n$ svn propdel\r\n<\/pre>\n
Branch and Merge<\/h3>\n
Versionskontrolle nach Art von Subversion<\/a>
\nVerwenden von Zweigen<\/a>
\nSubversion Howto Branch, Merge, Reintegrate<\/a><\/p>\n
How do I make Subversion use a third-party diff tool?<\/a><\/p>\n
Problems with Merging<\/h4>\n
Reintegrate can only be used if revisions X through Y were previously merged from  to reintegrate the source, but this is not the case<\/a>
\nsvn merge with –reintegrate complains about missing ranges but mergeinfo seems correct<\/a>
\nSubversion 1.5 Mergeinfo – Understanding the Internals<\/a>
\nsvn mergeinfo<\/a>
\nGrundlegendes Zusammenf\u00fchren – Mergeinfo und Vorschauen<\/a><\/p>\n
\r\n# Get\r\n$ svn propget -R svn:mergeinfo .\r\n\r\n# Delete\r\n$ svn propdel -R svn:mergeinfo .\r\n\r\n# Commit\r\n$ svn commit -m "removed property svn:mergeinfo from all files"\r\n<\/pre>\n
Fedora askpassword\/pinentry GUI<\/h3>\n
How to disable pinentry-qt in fedora 20 for git-svn ?<\/a>
\nDisable the pinentry GUI window (for ssh, svn+ssh, gpg, \u2026) under Linux<\/a><\/p>\n
\r\n$ ps aux | grep pinentry-gtk-2\r\nandreas  15078 91.0  0.0 249508  2780 ?        RL   11:13  22:19 \/usr\/bin\/pinentry-gtk-2\r\n$ export PINENTRY_USER_DATA="USE_CURSES=1"\r\n$ unset GPG_AGENT_INFO\r\n<\/pre>\n
\r\n$ export | grep ask\r\ndeclare -x SSH_ASKPASS="\/usr\/libexec\/openssh\/gnome-ssh-askpass"\r\n$ unset SSH_ASKPASS\r\n<\/pre>\n
Migration<\/h3>\n
Subversion<\/h4>\n
\r\n$ svnadmin dump http:\/\/projectname.googlecode.com\/svn > repodump\r\nsvnadmin: 'http:\/\/projectname.googlecode.com\/svn' is an URL when it should be a path\r\n\r\n> svnadmin create c:\/rep_new\r\n$ svnadmin create \/home\/svn\/repo_new\r\n\r\n> echo > c:\\rep_new\\hooks\\pre-revprop-change.cmd\r\n$ echo \u2018#!\/bin\/sh\u2019 > \/home\/svn\/repo_new\/hooks\/pre-revprop-change\r\n$ chmod +x \/home\/svn\/repo_new\/hooks\/pre-revprop-change\r\n\r\n> svnsync init file:\/\/\/c:\/repository https:\/\/example.googlecode.com\/svn\r\n$ svnsync init file:\/\/\/home\/svn\/repo_new https:\/\/example.googlecode.com\/svn\r\n\r\n> svnsync sync file:\/\/\/c:\/repository\r\n$ svnsync sync file:\/\/\/home\/svn\/repo_new\r\n<\/pre>\n
git<\/h4>\n
How to migrate svn to another repository<\/a>
\nMigrate to Git from SVN<\/a>
\nSVN copy between repositories with history<\/a><\/p>\n
\r\n1. Get a git svn clone of each repository:\r\n    git svn clone <SVN-REPOSITORY-FROM> source-repo\r\n    git svn clone <SVN-REPOSITORY-TO> dest-repo\r\n\r\n 2. Create patches to be imported:\r\n    cd source-repo\/\r\n    export commitFrom=`git log --pretty=%H | tail -1`\r\n    git format-patch -o \/tmp\/mergepatchs ${commitFrom}..HEAD .\r\n\r\n 3. Import the patches\r\n    cd dest-repo\/\r\n    git am \/tmp\/mergepatchs\/*.patch\r\n\r\n 4. Check difference (= svn status)\r\n    git diff --name-status remotes\/git-svn\r\n  \r\n 5. Commit to remote repository\r\n    git svn dcommit\r\n<\/pre>\n
pitfalls svn -> git migration<\/a>
\nAfter \u201cgit svn clone\u201d, I still don’t have fantastic branch-merging commit?<\/a>
\nFixing SVN Merge History in Git Repositories<\/a><\/p>\n
External Diff Program<\/h3>\n
Send your svn diff to meld<\/a><\/p>\n
\r\n$ svn diff --diff-cmd='meld' file.c\r\n<\/pre>\n
How to make svn diff produce file that patch would apply, when svn cp or svn mv was used?<\/a><\/p>\n
\r\n$ svn diff --diff-cmd \/usr\/bin\/diff -x "-i -b -U" > mypatch\r\n<\/pre>\n
Unversioned Files<\/h3>\n
\r\n$ svn status --no-ignore | grep '^\\?' | sed 's\/^\\?      \/\/'\r\n$ svn status --no-ignore | grep '^\\?' | sed 's\/^\\?      \/\/'  | xargs -Ixx rm -rf xx\r\n<\/pre>\n
Delete Unversioned Files Under SVN<\/a><\/p>\n
Keywords<\/h3>\n
Subversion Keywords: Id Rev Author Date<\/p>\n
\r\n\r\n[miscellany]\r\nenable-auto-props = yes\r\n\r\n[auto-props]\r\n*.c = svn:keywords=Author Date Id Rev URL;svn:eol-style=native\r\n*.h = svn:keywords=Author Date Id Rev URL;svn:eol-style=native\r\n\r\n<\/pre>\n
Undo \/ revert commit<\/h3>\n
How do I return to an older version of our code in Subversion?<\/a>
\nsubversion: How to revert a bad commit<\/a>
\nReverting a Commit in Subversion<\/a><\/p>\n
\r\nsvn merge -r [current_version]:[previous_version] [repository_url]\r\nsvn commit -m \u201cReverting previous commit and going back to revision [previous_version].\u201d\r\n<\/pre>\n
Add folder without included files<\/h3>\n
\r\n$ svn add --depth=empty <directory>\r\n<\/pre>\n
Add directory structure to SVN, without files<\/a><\/p>\n
Undo added files<\/h3>\n
\r\n$ svn revert --recursive <file\/directory>\r\nor\r\n$ svn delete --keep-local <file\/directory>\r\n<\/pre>\n
\u201cunadd\u201d a file to svn before commit<\/a>
\nUndo svn add without reverting local edits<\/a><\/p>\n
Remove .svn folders<\/h3>\n
\r\nfind -type d -name .svn | xargs rm -rf\r\n<\/pre>\n
Remove .svn folders<\/a><\/p>\n
Ignore files\/directories<\/h3>\n
Individual:<\/p>\n
\r\n$ svn propset svn:ignore <file to ignore> <folder to set>\r\n$ svn propset svn:ignore -F file_list.txt <folder to set>\r\n<\/pre>\n
svn propset \u2014 Den Wert von PROPNAME f\u00fcr Dateien, Verzeichnisse oder Revisionen auf PROPVAL setzen<\/a><\/p>\n
Global<\/p>\n
\r\n[miscellany]\r\nglobal-ignores = <files to ignore>\r\n<\/pre>\n
Resolve conflicts<\/h3>\n
\r\n# Use manually solved files, recursively\r\n$ svn resolve --accept working -R <directory>\r\n<\/pre>\n\n\n\n\n\n
base<\/td>\nAuswahl der Datei, die die BASE-Revision gewesen war, bevor Sie Ihre Arbeitskopie aktualisierten. Das hei\u00dft, die Datei, die Sie ausgecheckt hatten, bevor Sie Ihre letzten \u00c4nderungen vornahmen.<\/td>\n<\/tr>\n
working<\/td>\nAuswahl der aktuellen Datei in Ihrer Arbeitskopie unter der Annahme, dass Sie Konflikte manuell aufgel\u00f6st haben.<\/td>\n<\/tr>\n
mine-full<\/td>\nAuswahl der Kopien konfliktbehafteter Dateien, mit dem Inhalt zum Zeitpunkt unmittelbar vor Ihrem Aufruf von svn update.<\/td>\n<\/tr>\n
theirs-full<\/td>\nAuswahl der Kopien konfliktbehafteter Dateien, mit dem Inhalt der Revisionen, die Sie durch den Aufruf von svn update vom Server geholt haben.<\/td>\n<\/tr>\n<\/table>\n
svn resolve \u2014 Konflikte in Dateien und Verzeichnissen der Arbeitskopie aufl\u00f6sen<\/a><\/p>\n
E160013: ‘\/svn\/XXX\/!svn\/me’ path not found<\/h3>\n
\r\n$ dpkg -l | grep subversion\r\nii  subversion                             1.7.5-1ubuntu2                             amd64        Advanced version control system\r\n\r\nServer:\r\nPowered by Apache Subversion version 1.7.4 (r1295709)\r\n<\/pre>\n
\r\n$ svn commit -m "add [...]"\r\nsvn: E160013: Commit failed (details follow):\r\nsvn: E160013: '\/svn\/XXX\/!svn\/me' path not found\r\n<\/pre>\n
Connection reset by peer<\/h3>\n
Solving checkout problems with svn repositories<\/a>
\nTimeouts\/connection reset using SVN 1.6.11\/Apache 2.2.15<\/a>
\nLaufzeit-Konfigurationsbereich<\/a>
\nSVN Operations Taking Longer than an Hour Time Out<\/a>
\nSVN commit doesn’t complete<\/a><\/p>\n
\r\nClient:\r\n%APPDATA%\\Subversion\\servers: http-timeout = 900\r\n%LOCALAPPDATA%\\Subversion\\servers: http-timeout = 900\r\n"~\/.subversion\/servers: http-timeout = 900\r\n\r\nServer:\r\napache2\/httpd.conf: TimeOut 900\r\n<\/pre>\n
TortoiseSVN<\/h3>\n
How do I configure TortoiseSVN’s external merge behavior?<\/a><\/p>\n
\r\n%base   - the original file without your or the others changes\r\n%bname  - The window title for the base file\r\n%mine   - your own file, with your changes\r\n%yname  - The window title for your file\r\n%theirs - the file as it is in the repository\r\n%tname  - The window title for the file in the repository\r\n%merged - the conflicted file, the result of the merge operation\r\n%mname  - The window title for the merged file \r\n<\/pre>\n
WinMerge<\/h3>\n
\r\nC:\\Program Files (x86)\\WinMerge\\WinMergeU.exe -e -ub -dl %bname -dr %yname %base %mine\r\n<\/pre>\n
Meld<\/h3>\n
Meld (official)<\/a>
\nGNOME: Meld<\/a>
\nMeld Installer for Windows<\/a> (inactive)
\nUsing Meld as external diff tool with Tortoise SVN<\/a>
\nHow to set up svn conflict resolution with meld?<\/a><\/p>\n
\r\nmerge-tool-cmd = \/opt\/svn-merge-meld\r\n<\/pre>\n
\r\nC:\\Program Files (x86)\\Meld\\meld\\meld.exe %theirs %merged %mine\r\n<\/pre>\n
\r\nC:\\Program Files (x86)\\Meld\\meld\\meld.exe --auto-merge --output %merged %mine %base %theirs\r\n<\/pre>\n
Filter<\/b><\/p>\n\n\n
\"meld_text_filter_freebsd\"<\/a><\/td>\n<\/tr>\n<\/table>\n
SvnMapper<\/h3>\n
SvnMapper<\/a>
\nGraphical representation of SVN branch\/merge activity [closed]<\/a>
\nVisualising Subversion branching\/merging history<\/a>
\nAnyone use SvnMapper? please help me!<\/a>
\nDownload the Corflags.exe<\/a><\/p>\n
\r\nC:\\Program Files (x86)\\SvnMapper>corflags.exe SvnMapper.exe\r\nMicrosoft (R) .NET Framework CorFlags Conversion Tool.  Version  2.0.50727.42\r\nCopyright (c) Microsoft Corporation.  All rights reserved.\r\n\r\nVersion   : v2.0.50727\r\nCLR Header: 2.5\r\nPE        : PE32\r\nCorFlags  : 1\r\nILONLY    : 1\r\n32BIT     : 0\r\nSigned    : 0\r\n\r\nC:\\Program Files (x86)\\SvnMapper>corflags.exe SvnMapper.exe \/32bit+\r\nMicrosoft (R) .NET Framework CorFlags Conversion Tool.  Version  2.0.50727.42\r\nCopyright (c) Microsoft Corporation.  All rights reserved.\r\n\r\ncorflags : error CF001 : Could not open file for writing\r\n<\/pre>\n
\r\nC:\\Program Files (x86)\\SvnMapper>corflags.exe SvnMapper.exe \/32bit+\r\nMicrosoft (R) .NET Framework CorFlags Conversion Tool.  Version  2.0.50727.42\r\nCopyright (c) Microsoft Corporation.  All rights reserved.\r\n\r\n\r\nC:\\Program Files (x86)\\SvnMapper>corflags.exe SvnMapper.exe\r\nMicrosoft (R) .NET Framework CorFlags Conversion Tool.  Version  2.0.50727.42\r\nCopyright (c) Microsoft Corporation.  All rights reserved.\r\n\r\nVersion   : v2.0.50727\r\nCLR Header: 2.5\r\nPE        : PE32\r\nCorFlags  : 3\r\nILONLY    : 1\r\n32BIT     : 1\r\nSigned    : 0\r\n<\/pre>\n","protected":false},"excerpt":{"rendered":"
Video-Tutorial Software Carpentry – Version Control with Subversion General What do \u201cbranch\u201d, \u201ctag\u201d and \u201ctrunk\u201d mean in Subversion repositories? What is trunk, branch and tag in Subversion? Externals Externals Definitions Adding an External Repository to an SVN Project Properties \/ Eigenschaften Eigenschaften $ svn proplist -v . $ svn propset <name> <value> $ svn propedit […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[10],"tags":[],"class_list":["post-543","post","type-post","status-publish","format-standard","hentry","category-ubuntu"],"_links":{"self":[{"href":"https:\/\/blog.bachi.net\/index.php?rest_route=\/wp\/v2\/posts\/543","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/blog.bachi.net\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.bachi.net\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.bachi.net\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.bachi.net\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=543"}],"version-history":[{"count":46,"href":"https:\/\/blog.bachi.net\/index.php?rest_route=\/wp\/v2\/posts\/543\/revisions"}],"predecessor-version":[{"id":4302,"href":"https:\/\/blog.bachi.net\/index.php?rest_route=\/wp\/v2\/posts\/543\/revisions\/4302"}],"wp:attachment":[{"href":"https:\/\/blog.bachi.net\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=543"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.bachi.net\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=543"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.bachi.net\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=543"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}