[PATCH] Merging identical changes from another branch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Merging identical changes from another branch
From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk>
The issue comes up when a local uncommitted *new* file (i.e. not in the
current manifest) is being merged with an identical file from a branch.
Since the file is not in the current manifest (it's either in the
current "to-be-added" list, or in the "unknown" state), there's no
(local) node from which to create a mergepoint.
manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01
92uuMswZXcoCchQAaxew7C0=
=qRsk
-----END PGP SIGNATURE-----
#!/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