##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

fix parsing of tags. make parse errors useful. add new tag tests....
fix parsing of tags. make parse errors useful. add new tag tests. old code read every head of .hgtags. delete and recreate of .hgtags gave new head, but if error in deleted rev, .hgtags had error messages every time it was parsed. this was very hard to fix, because deleted revs hard to get back and update, needed merges too. new code reads .hgtags on every head. advantage is if parse error happens with new code, is possible to fix them by editing .hgtags on a head and committing. NOTE: new code uses binary search of manifest of each head to be fast, but still much slower than old code. best thing would be to have delete record stored in filelog so we never touch manifest. could find live heads directly from filelog. this is more work than i want now. new tests check for parse of tags on different heads, and inaccessible heads created by delete and recreate of .hgtags.
Vincent Danjean - - Load All Authors

File last commit:

r1341:3ab6e55e default
r2320:dbdce3b9 default
Show More
hgmerge.1.txt
35 lines | 827 B | text/plain | TextLexer
/ doc / hgmerge.1.txt
History | Source | Raw |Copy content |Copy permalink
mpm@selenic.com
Add hgmerge manpage...
 r466 HGMERGE(1)
==========
Matt Mackall <mpm@selenic.com>
v0.1, 27 May 2005
NAME
----
hgmerge - default wrapper to merge files in Mercurial SCM system
SYNOPSIS
--------
'hgmerge' local ancestor remote
DESCRIPTION
-----------
The hgmerge(1) command provides a graphical interface to merge files in the
Mercurial system. It is a simple wrapper around kdiff3, merge(1) and tkdiff(1),
or simply diff(1) and patch(1) depending on what is present on the system.
hgmerge(1) is used by the Mercurial SCM if the environment variable HGMERGE is
not set.
AUTHOR
------
Written by Vincent Danjean <Vincent.Danjean@free.fr>
SEE ALSO
--------
hg(1) - the command line interface to Mercurial SCM
COPYING
-------
Vincent Danjean
Fix copyright symbol in docs...
 r1341 Copyright \(C) 2005 Matt Mackall.
mpm@selenic.com
Add hgmerge manpage...
 r466 Free use of this software is granted under the terms of the GNU General
Public License (GPL).