• View
• Edit
• History
• Attach
• Print

DotFileConflicts

This page contains one-liners (typically written in sed) to automatically clear out metadata in dotfiles which come into conflict automatically and frequently, when automatically updated by the programs that use them. I (Ken Bloom) stick them in the beginning of my recursive commit script, and clean out the files before commits.

A couple of useful shell aliases

These are for resolving all of the conflicts in a directory (and its children) in one direction or the other. Actually, I think these shell functions may be a bit too useful, and I should rely on them less and create more munging commands (listed below).

conflicts-revert () 
{ 
    [[ -n "$1" ]] && pushd $1 >/dev/null;
    svn stat | awk '/^C/{print $2}' | xargs svn revert;
    [[ -n "$1" ]] && popd >/dev/null
}
conflicts-mine () 
{ 
    [[ -n "$1" ]] && pushd $1 >/dev/null;
    for x in $(svn stat | awk '/^C/{print $2}');
    do
        mv -f $x.mine $x;
        svn resolved $x;
    done;
    [[ -n "$1" ]] && popd >/dev/null
}
conflicts-list () 
{ 
    [[ -n "$1" ]] && pushd $1 >/dev/null;
    svn stat | grep '^C';
    [[ -n "$1" ]] && popd >/dev/null
}

.gaim/blist.xml

   sed -i .gaim/blist.xml \
   -e "/<setting/d"

.kde/share/apps/konqueror/bookmarks.xml

   sed -i .kde/share/apps/konqueror/bookmarks.xml \
   -e "\@info@,\@/info@d"

.kde/share/config/konquerorrc

   sed -i .kde/share/config/konquerorrc \
   -e "/^Recent Files/d"