Mercurial > hg > mercurial-crew-with-dirclash
view hg @ 1674:dee55c4a4963
abort when using 'update -m' and this is not a merge
add more testcases for updating with local changes
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 01 Feb 2006 08:46:24 +0100 |
parents | 03f27b1381f9 |
children | ad4a2eefe4d7 |
line wrap: on
line source
#!/usr/bin/env python # # mercurial - a minimal scalable distributed SCM # v0.6 "paola" # # Copyright 2005 Matt Mackall <mpm@selenic.com> # # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. from mercurial import commands commands.run()