Mercurial > hg

annotate tkmerge @ 19:12360c04fa48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
From: Thomas Arendsen Hein <thomas@intevation.de> mercurial 0.4d had the same problems with removing files, but attached is a patch which fixes that problem. The key change is in dircache.remove(): del self[f] should have been del self.map[f] This error was hidden by the 'except: pass' statement.
author mpm@selenic.com
date Wed, 04 May 2005 15:32:16 -0800
parents 9117c6561b0b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
1 merge $1 $3 $2 || tkdiff -conflict $1 -o $1
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
2