Mercurial > hg > mercurial-crew-with-dirclash
view contrib/git-viz/hg-viz @ 1798:d610fe0e6893
hgmerge: do not use file with markers in tools merging themselves
This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Thu, 23 Feb 2006 18:10:04 +0100 |
parents | d8abb687d501 |
children |
line wrap: on
line source
#!/bin/sh set -e if test x"$1" != x ; then cd $1 fi if [ ! -d ".hg" ]; then echo "${1:-.} is not a mercurial repository" 1>&2 echo "Aborting" 1>&2 exit 1 fi if [ ! -d ".git" ]; then mkdir -v ".git" fi if [ -e ".git/HEAD" ]; then if [ ! -e ".git/HEAD.hg-viz-save" ]; then mv -v ".git/HEAD" ".git/HEAD.hg-viz-save" else rm -vf ".git/HEAD" fi fi hg history | head -1 | awk -F: '{print $3}' > .git/HEAD git-viz