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.
hg
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 03 Jul 2006 19:14:29 +0200
changeset 2548 0229ff95faec
parent 1698 ad4a2eefe4d7
child 3886 abaee83ce0a6
permissions -rwxr-xr-x
Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
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
 
#!/usr/bin/env python
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset 
     2
 
#
1698
ad4a2eefe4d7 Update copyright notice
Matt Mackall <mpm@selenic.com>
parents: 515
diff changeset 
     3
 
# mercurial - scalable distributed SCM
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset 
     4
 
#
1698
ad4a2eefe4d7 Update copyright notice
Matt Mackall <mpm@selenic.com>
parents: 515
diff changeset 
     5
 
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset 
     6
 
#
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset 
     7
 
# This software may be used and distributed according to the terms
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset 
     8
 
# of the GNU General Public License, incorporated herein by reference.
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset 
     9
 







248






b7645b3c86ff
migrate remaining commands



mpm@selenic.com


parents: 
247

diff
changeset




    10


from mercurial import commands








0






9117c6561b0b
Add back links from file revisions to changeset revisions



mpm@selenic.com


parents: 

diff
changeset




    11









249






619e775aa7f9
import and startup cleanups



mpm@selenic.com


parents: 
248

diff
changeset




    12


commands.run()















mercurial-crew-with-dirclash