Mercurial > hg-stable

comparison hgext/fetch.py @ 10263:25e572394f5c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update license to GPLv2+
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:20:08 -0600
parents 1aeb22492b25
children 612c142b7a82
comparison
equal deleted inserted replaced
10262:eb243551cbd8 10263:25e572394f5c
1 # fetch.py - pull and merge remote changes 1 # fetch.py - pull and merge remote changes
2 # 2 #
3 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> 3 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
4 # 4 #
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2, incorporated herein by reference. 6 # GNU General Public License version 2 or any later version.
7 7
8 '''pull, update and merge in one command''' 8 '''pull, update and merge in one command'''
9 9
10 from mercurial.i18n import _ 10 from mercurial.i18n import _
11 from mercurial.node import nullid, short 11 from mercurial.node import nullid, short