comparison doc/hg.1.txt @ 966:022bcc738389

hg import: abort with uncommitted changes, override with --force
author mpm@selenic.com
date Fri, 19 Aug 2005 23:07:31 -0800
parents 84355e3e4493
children 4f81068ed8cd
comparison
equal deleted inserted replaced
965:a425123e6afe 966:022bcc738389
186 hash identifiers, followed by a "+" if there are uncommitted changes 186 hash identifiers, followed by a "+" if there are uncommitted changes
187 in the working directory, followed by a list of tags for this revision. 187 in the working directory, followed by a list of tags for this revision.
188 188
189 aliases: id 189 aliases: id
190 190
191 import [-p <n> -b <base> -q] <patches>:: 191 import [-p <n> -b <base> -f] <patches>::
192 Import a list of patches and commit them individually. 192 Import a list of patches and commit them individually.
193 193
194 options: 194 options:
195 -p, --strip <n> directory strip option for patch. This has the same 195 -p, --strip <n> directory strip option for patch. This has the same
196 meaning as the correnponding patch option 196 meaning as the correnponding patch option
197 -b <path> base directory to read patches from 197 -b <path> base directory to read patches from
198 -f, --force skip check for outstanding uncommitted changes
198 199
199 aliases: patch 200 aliases: patch
200 201
201 incoming [source]:: 202 incoming [source]::
202 Show new changesets found in the specified repo or the default 203 Show new changesets found in the specified repo or the default