Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tkmerge
author mpm@selenic.com
Tue, 31 May 2005 08:56:05 -0800
changeset 199 2424676edd8c
parent 0 9117c6561b0b
permissions -rw-r--r--
annotate: deal with merges -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 annotate: deal with merges This rewrite of the annotate code deals with merges: - - find all ancestors - - sort ancestors topologically - - for each ancestor, pairwise annotate with parents - - keep a cache of annotations for efficiency manifest hash: b960d9b9c6a7f6ba351c97675b00a1dd3004dcf1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnJclywK+sNU5EO8RAphZAKCkUuHh4jEJz7YwD9uzCT76GaSR/wCfUVUQ VbGna/9jrOAFlrB3mZ3e4qg= =yDFy -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
 














mercurial-crew-with-dirclash