Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/repo.py @ 1772:b1a7fd503a29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgmerge: logic changes Details: - keep automatic merge conflicts in $LOCAL - do not assume that $EDITOR returns proper error code - fix a slight mistake in diff+patch merge success detection (it could succeed if the $EDITOR failed to run)
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Tue, 21 Feb 2006 15:48:16 -0600
parents 142b5d5ec9cc
children ffb895f16925
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1089
142b5d5ec9cc Break apart hg.py
mpm@selenic.com
parents:
diff changeset
1 # repo.py - repository base classes for mercurial
142b5d5ec9cc Break apart hg.py
mpm@selenic.com
parents:
diff changeset
2 #
142b5d5ec9cc Break apart hg.py
mpm@selenic.com
parents:
diff changeset
3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
142b5d5ec9cc Break apart hg.py
mpm@selenic.com
parents:
diff changeset
4 #
142b5d5ec9cc Break apart hg.py
mpm@selenic.com
parents:
diff changeset
5 # This software may be used and distributed according to the terms
142b5d5ec9cc Break apart hg.py
mpm@selenic.com
parents:
diff changeset
6 # of the GNU General Public License, incorporated herein by reference.
142b5d5ec9cc Break apart hg.py
mpm@selenic.com
parents:
diff changeset
7
142b5d5ec9cc Break apart hg.py
mpm@selenic.com
parents:
diff changeset
8 class RepoError(Exception): pass