Mercurial > hg
comparison hgext/fetch.py @ 8225:46293a0c7e9f
updated license to be explicit about GPL version 2
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 26 Apr 2009 01:08:54 +0200 |
| parents | f3abe032fc89 |
| children | eee2319c5895 |
comparison
equal
deleted
inserted
replaced
| 8224:1075f5c1b3fa | 8225:46293a0c7e9f |
|---|---|
| 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 | 5 # This software may be used and distributed according to the terms of the |
| 6 # of the GNU General Public License, incorporated herein by reference. | 6 # GNU General Public License version 2, incorporated herein by reference. |
| 7 '''pulling, updating and merging in one command''' | 7 '''pulling, updating and merging in one command''' |
| 8 | 8 |
| 9 from mercurial.i18n import _ | 9 from mercurial.i18n import _ |
| 10 from mercurial.node import nullid, short | 10 from mercurial.node import nullid, short |
| 11 from mercurial import commands, cmdutil, hg, util, url | 11 from mercurial import commands, cmdutil, hg, util, url |