comparison mercurial/commands.py @ 15780:713ee57f817b

merge with stable
author Martin Geisler <mg@lazybytes.net>
date Fri, 06 Jan 2012 11:43:17 +0100
parents 12309c09d19a 01831f55e972
children 2c480532f36e
comparison
equal deleted inserted replaced
15778:f15c646bffc7 15780:713ee57f817b
3442 repository, not touching the working directory. Without --exact, 3442 repository, not touching the working directory. Without --exact,
3443 patches will be applied on top of the working directory parent 3443 patches will be applied on top of the working directory parent
3444 revision. 3444 revision.
3445 3445
3446 With -s/--similarity, hg will attempt to discover renames and 3446 With -s/--similarity, hg will attempt to discover renames and
3447 copies in the patch in the same way as 'addremove'. 3447 copies in the patch in the same way as :hg:`addremove`.
3448 3448
3449 To read a patch from standard input, use "-" as the patch name. If 3449 To read a patch from standard input, use "-" as the patch name. If
3450 a URL is specified, the patch will be downloaded from it. 3450 a URL is specified, the patch will be downloaded from it.
3451 See :hg:`help dates` for a list of formats valid for -d/--date. 3451 See :hg:`help dates` for a list of formats valid for -d/--date.
3452 3452