43 " aliases: %s\n" |
43 " aliases: %s\n" |
44 "\n" |
44 "\n" |
45 msgstr "" |
45 msgstr "" |
46 " alias: %s\n" |
46 " alias: %s\n" |
47 "\n" |
47 "\n" |
|
48 |
|
49 msgid "" |
|
50 "Mercurial reads configuration data from several files, if they exist.\n" |
|
51 "Below we list the most specific file first.\n" |
|
52 "\n" |
|
53 "On Windows, these configuration files are read:\n" |
|
54 "\n" |
|
55 "- ``<repo>\\.hg\\hgrc``\n" |
|
56 "- ``%USERPROFILE%\\.hgrc``\n" |
|
57 "- ``%USERPROFILE%\\Mercurial.ini``\n" |
|
58 "- ``%HOME%\\.hgrc``\n" |
|
59 "- ``%HOME%\\Mercurial.ini``\n" |
|
60 "- ``C:\\Mercurial\\Mercurial.ini``\n" |
|
61 "- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" |
|
62 "- ``<install-dir>\\Mercurial.ini``\n" |
|
63 "\n" |
|
64 "On Unix, these files are read:\n" |
|
65 "\n" |
|
66 "- ``<repo>/.hg/hgrc``\n" |
|
67 "- ``$HOME/.hgrc``\n" |
|
68 "- ``/etc/mercurial/hgrc``\n" |
|
69 "- ``/etc/mercurial/hgrc.d/*.rc``\n" |
|
70 "- ``<install-root>/etc/mercurial/hgrc``\n" |
|
71 "- ``<install-root>/etc/mercurial/hgrc.d/*.rc``\n" |
|
72 "\n" |
|
73 "The configuration files for Mercurial use a simple ini-file format. A\n" |
|
74 "configuration file consists of sections, led by a ``[section]`` header\n" |
|
75 "and followed by ``name = value`` entries::\n" |
|
76 "\n" |
|
77 " [ui]\n" |
|
78 " username = Firstname Lastname <firstname.lastname@example.net>\n" |
|
79 " verbose = True\n" |
|
80 "\n" |
|
81 "This above entries will be referred to as ``ui.username`` and\n" |
|
82 "``ui.verbose``, respectively. Please see the hgrc man page for a full\n" |
|
83 "description of the possible configuration values:\n" |
|
84 "\n" |
|
85 "- on Unix-like systems: ``man hgrc``\n" |
|
86 "- online: http://www.selenic.com/mercurial/hgrc.5.html\n" |
|
87 msgstr "" |
48 |
88 |
49 msgid "" |
89 msgid "" |
50 "Some commands allow the user to specify a date, e.g.:\n" |
90 "Some commands allow the user to specify a date, e.g.:\n" |
51 "\n" |
91 "\n" |
52 "- backout, commit, import, tag: Specify the commit date.\n" |
92 "- backout, commit, import, tag: Specify the commit date.\n" |
400 " \"foo\".\n" |
440 " \"foo\".\n" |
401 ":date: Date. Returns a date in a Unix date format, including\n" |
441 ":date: Date. Returns a date in a Unix date format, including\n" |
402 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" |
442 " the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" |
403 ":domain: Any text. Finds the first string that looks like an\n" |
443 ":domain: Any text. Finds the first string that looks like an\n" |
404 " email address, and extracts just the domain\n" |
444 " email address, and extracts just the domain\n" |
405 " component. Example: 'User <user@example.com>' becomes\n" |
445 " component. Example: ``User <user@example.com>`` becomes\n" |
406 " 'example.com'.\n" |
446 " ``example.com``.\n" |
407 ":email: Any text. Extracts the first string that looks like\n" |
447 ":email: Any text. Extracts the first string that looks like\n" |
408 " an email address. Example: 'User <user@example.com>'\n" |
448 " an email address. Example: ``User <user@example.com>``\n" |
409 " becomes 'user@example.com'.\n" |
449 " becomes ``user@example.com``.\n" |
410 ":escape: Any text. Replaces the special XML/XHTML characters\n" |
450 ":escape: Any text. Replaces the special XML/XHTML characters\n" |
411 " \"&\", \"<\" and \">\" with XML entities.\n" |
451 " \"&\", \"<\" and \">\" with XML entities.\n" |
412 ":fill68: Any text. Wraps the text to fit in 68 columns.\n" |
452 ":fill68: Any text. Wraps the text to fit in 68 columns.\n" |
413 ":fill76: Any text. Wraps the text to fit in 76 columns.\n" |
453 ":fill76: Any text. Wraps the text to fit in 76 columns.\n" |
414 ":firstline: Any text. Returns the first line of text.\n" |
454 ":firstline: Any text. Returns the first line of text.\n" |
1078 " contains a key, followed by a space, followed by one or two\n" |
1121 " contains a key, followed by a space, followed by one or two\n" |
1079 " comma-separated values. The key is the revision ID in the source\n" |
1122 " comma-separated values. The key is the revision ID in the source\n" |
1080 " revision control system whose parents should be modified (same\n" |
1123 " revision control system whose parents should be modified (same\n" |
1081 " format as a key in .hg/shamap). The values are the revision IDs\n" |
1124 " format as a key in .hg/shamap). The values are the revision IDs\n" |
1082 " (in either the source or destination revision control system) that\n" |
1125 " (in either the source or destination revision control system) that\n" |
1083 " should be used as the new parents for that node.\n" |
1126 " should be used as the new parents for that node. For example, if\n" |
|
1127 " you have merged \"release-1.0\" into \"trunk\", then you should\n" |
|
1128 " specify the revision on \"trunk\" as the first parent and the one on\n" |
|
1129 " the \"release-1.0\" branch as the second.\n" |
1084 "\n" |
1130 "\n" |
1085 " The branchmap is a file that allows you to rename a branch when it is\n" |
1131 " The branchmap is a file that allows you to rename a branch when it is\n" |
1086 " being brought in from whatever external repository. When used in\n" |
1132 " being brought in from whatever external repository. When used in\n" |
1087 " conjunction with a splicemap, it allows for a powerful combination\n" |
1133 " conjunction with a splicemap, it allows for a powerful combination\n" |
1088 " to help fix even the most badly mismanaged repositories and turn them\n" |
1134 " to help fix even the most badly mismanaged repositories and turn them\n" |
3712 "directly from the commandline. See the [email] and [smtp] sections in\n" |
3758 "directly from the commandline. See the [email] and [smtp] sections in\n" |
3713 "hgrc(5) for details.\n" |
3759 "hgrc(5) for details.\n" |
3714 msgstr "" |
3760 msgstr "" |
3715 |
3761 |
3716 #, python-format |
3762 #, python-format |
3717 msgid "%sPlease enter a valid value" |
3763 msgid "%s Please enter a valid value" |
3718 msgstr "" |
3764 msgstr "%s Ange ett giltigt värde" |
3719 |
3765 |
3720 msgid "Please enter a valid value.\n" |
3766 msgid "Please enter a valid value.\n" |
3721 msgstr "" |
3767 msgstr "Ange ett giltigt värde.\n" |
3722 |
3768 |
3723 msgid "does the diffstat above look okay? " |
3769 msgid "does the diffstat above look okay?" |
3724 msgstr "" |
3770 msgstr "ser diffstaten ovanför okej ut?" |
3725 |
3771 |
3726 msgid "diffstat rejected" |
3772 msgid "diffstat rejected" |
3727 msgstr "" |
3773 msgstr "diffstat avvisad" |
3728 |
3774 |
3729 msgid "" |
3775 msgid "" |
3730 "send changesets by email\n" |
3776 "send changesets by email\n" |
3731 "\n" |
3777 "\n" |
3732 " By default, diffs are sent in the format generated by hg export,\n" |
3778 " By default, diffs are sent in the format generated by hg export,\n" |
4168 msgstr "" |
4214 msgstr "" |
4169 |
4215 |
4170 msgid "hg qrecord [OPTION]... PATCH [FILE]..." |
4216 msgid "hg qrecord [OPTION]... PATCH [FILE]..." |
4171 msgstr "" |
4217 msgstr "" |
4172 |
4218 |
|
4219 msgid "recreates hardlinks between repository clones" |
|
4220 msgstr "" |
|
4221 |
|
4222 msgid "" |
|
4223 "recreate hardlinks between two repositories\n" |
|
4224 "\n" |
|
4225 " When repositories are cloned locally, their data files will be " |
|
4226 "hardlinked\n" |
|
4227 " so that they only use the space of a single repository.\n" |
|
4228 "\n" |
|
4229 " Unfortunately, subsequent pulls into either repository will break " |
|
4230 "hardlinks\n" |
|
4231 " for any files touched by the new changesets, even if both repositories " |
|
4232 "end\n" |
|
4233 " up pulling the same changes.\n" |
|
4234 "\n" |
|
4235 " Similarly, passing --rev to \"hg clone\" will fail to use\n" |
|
4236 " any hardlinks, falling back to a complete copy of the source " |
|
4237 "repository.\n" |
|
4238 "\n" |
|
4239 " This command lets you recreate those hardlinks and reclaim that wasted\n" |
|
4240 " space.\n" |
|
4241 "\n" |
|
4242 " This repository will be relinked to share space with ORIGIN, which must " |
|
4243 "be\n" |
|
4244 " on the same local disk. If ORIGIN is omitted, looks for \"default-relink" |
|
4245 "\",\n" |
|
4246 " then \"default\", in [paths].\n" |
|
4247 "\n" |
|
4248 " Do not attempt any read operations on this repository while the command " |
|
4249 "is\n" |
|
4250 " running. (Both repositories will be locked against writes.)\n" |
|
4251 " " |
|
4252 msgstr "" |
|
4253 |
|
4254 #, python-format |
|
4255 msgid "relinking %s to %s\n" |
|
4256 msgstr "" |
|
4257 |
|
4258 #, python-format |
|
4259 msgid "collected %d candidate storage files\n" |
|
4260 msgstr "" |
|
4261 |
|
4262 msgid "source and destination are on different devices" |
|
4263 msgstr "" |
|
4264 |
|
4265 #, python-format |
|
4266 msgid "not linkable: %s\n" |
|
4267 msgstr "inte länkbar: %s\n" |
|
4268 |
|
4269 #, python-format |
|
4270 msgid "pruned down to %d probably relinkable files\n" |
|
4271 msgstr "" |
|
4272 |
|
4273 msgid " files" |
|
4274 msgstr "" |
|
4275 |
|
4276 msgid "relink" |
|
4277 msgstr "" |
|
4278 |
|
4279 #, python-format |
|
4280 msgid "relinked %d files (%d bytes reclaimed)\n" |
|
4281 msgstr "" |
|
4282 |
|
4283 msgid "[ORIGIN]" |
|
4284 msgstr "" |
|
4285 |
4173 msgid "share a common history between several working directories" |
4286 msgid "share a common history between several working directories" |
4174 msgstr "" |
4287 msgstr "" |
4175 |
4288 |
4176 msgid "" |
4289 msgid "" |
4177 "create a new shared repository (experimental)\n" |
4290 "create a new shared repository (experimental)\n" |
5054 " basename of the source.\n" |
5163 " basename of the source.\n" |
5055 "\n" |
5164 "\n" |
5056 " The location of the source is added to the new repository's\n" |
5165 " The location of the source is added to the new repository's\n" |
5057 " .hg/hgrc file, as the default to be used for future pulls.\n" |
5166 " .hg/hgrc file, as the default to be used for future pulls.\n" |
5058 "\n" |
5167 "\n" |
5059 " If you use the -r/--rev option to clone up to a specific revision,\n" |
|
5060 " no subsequent revisions (including subsequent tags) will be\n" |
|
5061 " present in the cloned repository. This option implies --pull, even\n" |
|
5062 " on local repositories.\n" |
|
5063 "\n" |
|
5064 " By default, clone will check out the head of the 'default' branch.\n" |
|
5065 " If the -U/--noupdate option is used, the new clone will contain\n" |
|
5066 " only a repository (.hg) and no working copy (the working copy\n" |
|
5067 " parent is the null revision).\n" |
|
5068 "\n" |
|
5069 " See 'hg help urls' for valid source format details.\n" |
5168 " See 'hg help urls' for valid source format details.\n" |
5070 "\n" |
5169 "\n" |
5071 " It is possible to specify an ssh:// URL as the destination, but no\n" |
5170 " It is possible to specify an ssh:// URL as the destination, but no\n" |
5072 " .hg/hgrc and working directory will be created on the remote side.\n" |
5171 " .hg/hgrc and working directory will be created on the remote side.\n" |
5073 " Please see 'hg help urls' for important details about ssh:// URLs.\n" |
5172 " Please see 'hg help urls' for important details about ssh:// URLs.\n" |
|
5173 "\n" |
|
5174 " If the -U/--noupdate option is specified, the new clone will contain\n" |
|
5175 " only a repository (.hg) and no working copy (the working copy parent\n" |
|
5176 " will be the null changeset). Otherwise, clone will initially check\n" |
|
5177 " out (in order of precedence):\n" |
|
5178 "\n" |
|
5179 " a) the changeset, tag or branch specified with -u/--updaterev\n" |
|
5180 " b) the changeset, tag or branch given with the first -r/--rev\n" |
|
5181 " c) the head of the default branch\n" |
|
5182 "\n" |
|
5183 " Use 'hg clone -u . src dst' to checkout the source repository's\n" |
|
5184 " parent changeset (applicable for local source repositories only).\n" |
|
5185 "\n" |
|
5186 " A set of changesets (tags, or branch names) to pull may be specified\n" |
|
5187 " by listing each changeset (tag, or branch name) with -r/--rev.\n" |
|
5188 " If -r/--rev is used, the cloned repository will contain only a subset\n" |
|
5189 " of the changesets of the source repository. Only the set of changesets\n" |
|
5190 " defined by all -r/--rev options (including their direct and indirect\n" |
|
5191 " parent changesets) will be pulled into the destination repository.\n" |
|
5192 " No subsequent changesets (including subsequent tags) will be present\n" |
|
5193 " in the destination.\n" |
|
5194 "\n" |
|
5195 " Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n" |
|
5196 " local source repositories.\n" |
5074 "\n" |
5197 "\n" |
5075 " For efficiency, hardlinks are used for cloning whenever the source\n" |
5198 " For efficiency, hardlinks are used for cloning whenever the source\n" |
5076 " and destination are on the same filesystem (note this applies only\n" |
5199 " and destination are on the same filesystem (note this applies only\n" |
5077 " to the repository data, not to the checked out files). Some\n" |
5200 " to the repository data, not to the checked out files). Some\n" |
5078 " filesystems, such as AFS, implement hardlinking incorrectly, but\n" |
5201 " filesystems, such as AFS, implement hardlinking incorrectly, but\n" |
5100 " källan att användas.\n" |
5223 " källan att användas.\n" |
5101 "\n" |
5224 "\n" |
5102 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
5225 " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" |
5103 " som standardplats att användas för framtida dragningar.\n" |
5226 " som standardplats att användas för framtida dragningar.\n" |
5104 "\n" |
5227 "\n" |
5105 " Om du använder flaggan -r/--rev för att klona fram till en specifik\n" |
|
5106 " revision, kommer inga efterföljande revisioner (inklusive efterföljande\n" |
|
5107 " märken) att finnas i det klonade arkivet. Denna flagga använder\n" |
|
5108 " automatiskt --pull, även för lokala arkiv.\n" |
|
5109 "\n" |
|
5110 " Som standard kommer clone att hämta ut toppen i grenen 'default'. Om\n" |
|
5111 " flaggan -U/--noupdate används, kommer den nya klonen bara att innehålla\n" |
|
5112 " ett arkiv (.hg) och igen arbetskopia (arbetskopians förälder är\n" |
|
5113 " null-revisionen.\n" |
|
5114 "\n" |
|
5115 " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
5228 " Se 'hg help urls' för detaljer om giltiga källformat.\n" |
|
5229 "\n" |
|
5230 " Det är möjligt att specificera en ssh://-URL som destination, men ingen\n" |
|
5231 " .hg/hgrc och arbetskatalog skapas på fjärrsidan. Se 'hg help urls' för\n" |
|
5232 " viktiga detaljer om ssh://-URLer.\n" |
|
5233 "\n" |
|
5234 " Om alternativet -U/--noupdate är angivet, kommer den nya klonen bara\n" |
|
5235 " att innehålla ett arkiv (.hg) och ingen arbetskopia (arbetskopians\n" |
|
5236 " förälder kommer att vara null-ändringen). Annars kommer klonen initialt\n" |
|
5237 " att hämta ut (i prioritetsordning):\n" |
|
5238 "\n" |
|
5239 " a) ändringen, taggen eller grenen specificerad med -u/--updaterev\n" |
|
5240 " b) ändringen, taggen eller grenen given med den första -r/--rev\n" |
|
5241 " c) huvudet på grenen 'default'\n" |
|
5242 "\n" |
|
5243 " Använd 'hg clone -u . källa dst' för att hämta ut källkodsarkivets\n" |
|
5244 " föräldraänrding (gäller bara för lokala arkiv).\n" |
|
5245 "\n" |
|
5246 " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
5247 " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
5248 " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
5249 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" |
|
5250 " -r/--rev (inklusive direkta och indirekta föräldrar) kommer att dras in\n" |
|
5251 " i destinationsarkivet. Inga efterföljande ändringar (inklusive\n" |
|
5252 " efterföljande märken) kommer att finnas i destinationen.\n" |
|
5253 "\n" |
|
5254 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" |
|
5255 " --pull, även för lokala arkiv.\n" |
5116 "\n" |
5256 "\n" |
5117 " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
5257 " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
5118 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
5258 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
5119 " inte de uthämtade filerna). Vissa filsystem såsom AFS implementerar\n" |
5259 " inte de uthämtade filerna). Vissa filsystem såsom AFS implementerar\n" |
5120 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
5260 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
6161 msgstr "" |
6308 msgstr "" |
6162 |
6309 |
6163 msgid "" |
6310 msgid "" |
6164 "retry file merges from a merge or update\n" |
6311 "retry file merges from a merge or update\n" |
6165 "\n" |
6312 "\n" |
6166 " This command will cleanly retry unresolved file merges using file\n" |
6313 " This command can cleanly retry unresolved file merges using file\n" |
6167 " revisions preserved from the last update or merge. To attempt to\n" |
6314 " revisions preserved from the last update or merge.\n" |
6168 " resolve all unresolved files, use the -a/--all switch.\n" |
|
6169 "\n" |
6315 "\n" |
6170 " If a conflict is resolved manually, please note that the changes\n" |
6316 " If a conflict is resolved manually, please note that the changes\n" |
6171 " will be overwritten if the merge is retried with resolve. The\n" |
6317 " will be overwritten if the merge is retried with resolve. The\n" |
6172 " -m/--mark switch should be used to mark the file as resolved.\n" |
6318 " -m/--mark switch should be used to mark the file as resolved.\n" |
|
6319 "\n" |
|
6320 " You can specify a set of files to operate on, or use the -a/-all\n" |
|
6321 " switch to select all unresolved files.\n" |
6173 "\n" |
6322 "\n" |
6174 " This command also allows listing resolved files and manually\n" |
6323 " This command also allows listing resolved files and manually\n" |
6175 " indicating whether or not files are resolved. All files must be\n" |
6324 " indicating whether or not files are resolved. All files must be\n" |
6176 " marked as resolved before a commit is permitted.\n" |
6325 " marked as resolved before a commit is permitted.\n" |
6177 "\n" |
6326 "\n" |
6560 |
6709 |
6561 msgid "" |
6710 msgid "" |
6562 "update working directory\n" |
6711 "update working directory\n" |
6563 "\n" |
6712 "\n" |
6564 " Update the repository's working directory to the specified\n" |
6713 " Update the repository's working directory to the specified\n" |
6565 " revision, or the tip of the current branch if none is specified.\n" |
6714 " changeset.\n" |
6566 " Use null as the revision to remove the working copy (like 'hg\n" |
6715 "\n" |
|
6716 " If no changeset is specified, attempt to update to the head of the\n" |
|
6717 " current branch. If this head is a descendant of the working\n" |
|
6718 " directory's parent, update to it, otherwise abort.\n" |
|
6719 "\n" |
|
6720 " The following rules apply when the working directory contains\n" |
|
6721 " uncommitted changes:\n" |
|
6722 "\n" |
|
6723 " 1. If neither -c/--check nor -C/--clean is specified, uncommitted\n" |
|
6724 " changes are merged into the requested changeset, and the merged " |
|
6725 "result\n" |
|
6726 " is left uncommitted. Updating and merging will occur only if the\n" |
|
6727 " requested changeset is an ancestor or descendant of the parent\n" |
|
6728 " changeset. Otherwise, the update is aborted and the uncommitted " |
|
6729 "changes\n" |
|
6730 " are preserved.\n" |
|
6731 "\n" |
|
6732 " 2. With the -c/--check option, the update is aborted and the\n" |
|
6733 " uncommitted changes are preserved.\n" |
|
6734 "\n" |
|
6735 " 3. With the -C/--clean option, uncommitted changes are discarded and\n" |
|
6736 " the working directory is updated to the requested changeset.\n" |
|
6737 "\n" |
|
6738 " Use null as the changeset to remove the working directory (like 'hg\n" |
6567 " clone -U').\n" |
6739 " clone -U').\n" |
6568 "\n" |
6740 "\n" |
6569 " When the working directory contains no uncommitted changes, it\n" |
6741 " If you want to update just one file to an older changeset, use 'hg " |
6570 " will be replaced by the state of the requested revision from the\n" |
6742 "revert'.\n" |
6571 " repository. When the requested revision is on a different branch,\n" |
|
6572 " the working directory will additionally be switched to that\n" |
|
6573 " branch.\n" |
|
6574 "\n" |
|
6575 " When there are uncommitted changes, use option -C/--clean to\n" |
|
6576 " discard them, forcibly replacing the state of the working\n" |
|
6577 " directory with the requested revision. Alternately, use -c/--check\n" |
|
6578 " to abort.\n" |
|
6579 "\n" |
|
6580 " When there are uncommitted changes and option -C/--clean is not\n" |
|
6581 " used, and the parent revision and requested revision are on the\n" |
|
6582 " same branch, and one of them is an ancestor of the other, then the\n" |
|
6583 " new working directory will contain the requested revision merged\n" |
|
6584 " with the uncommitted changes. Otherwise, the update will fail with\n" |
|
6585 " a suggestion to use 'merge' or 'update -C' instead.\n" |
|
6586 "\n" |
|
6587 " If you want to update just one file to an older revision, use\n" |
|
6588 " revert.\n" |
|
6589 "\n" |
6743 "\n" |
6590 " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
6744 " See 'hg help dates' for a list of formats valid for -d/--date.\n" |
6591 " " |
6745 " " |
6592 msgstr "" |
6746 msgstr "" |
6593 "uppdatera arbetskatalog\n" |
6747 "uppdatera arbetskatalogen\n" |
6594 "\n" |
6748 "\n" |
6595 " Uppdatera arkivets arbetskatalog till den specificerade revisionen\n" |
6749 " Uppdatera arkivets arbetskatalog till den specificerade ändringen.\n" |
6596 " eller toppen av den nuvarande grenen om ingen anges. Använd null som\n" |
6750 "\n" |
6597 " revision för att ta bort arbetskopian (som 'hg clone -U').\n" |
6751 " Om ingen ändring specificeras, kommer ett försök att göras för att\n" |
6598 "\n" |
6752 " hämta ut huvudet på den nuvarande grenen. Om huvudet är en ättling till\n" |
6599 " När arbetskatalogen inte innehåller oarkiverade ändringar, ersätts\n" |
6753 " den nuvarande grenen, uppdatera till det, annars avbryt.\n" |
6600 " den med tillståndet för den begärda revisionen från arkivet. När den\n" |
6754 "\n" |
6601 " begärda revisionen är i en annan gren, kommer arbetskatalogen att växla\n" |
6755 " Följande regler gäller när arbetskatalogen innehåller oarkiverade\n" |
6602 " till den grenen.\n" |
6756 " ändringar:\n" |
6603 "\n" |
6757 "\n" |
6604 " När det finns oarkiverade ändringar, använd flaggan -C/--clean för att\n" |
6758 " 1. Om varken -c/--check eller -C/--clean specificeras, kommer\n" |
6605 " kassera dem, och tvinga tillståndet i arbetskatalogen till den begärda\n" |
6759 " oarkiverade ändringar att sammanfogas med den begärda ändringen,\n" |
6606 " revisionen. Alternativt, använd -c/--check för att avbryta.\n" |
6760 " och det sammanfogade resultatet lämnas oarkiverat. Uppdatering och\n" |
6607 "\n" |
6761 " sammanfogning kommer bara att göras om den begärda ändringen är en\n" |
6608 " När det finns oarkiverade ändringar och flaggan -C/--clean inte " |
6762 " anfader eller ättling till föräldraändringen. Om inte, avbryts\n" |
6609 "används,\n" |
6763 " uppdateringen och de oarkiverade ändringarna lämnas.\n" |
6610 " och föräldrarevisionen och den begärda revisionen är på samma gren, och\n" |
6764 "\n" |
6611 " en av dem är en anfäder till den andre, kommer arbetskatalogen att\n" |
6765 " 2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n" |
6612 " innehålla den begärda revisionen sammanfogad med de oarkiverade\n" |
6766 " ändringarna lämnas.\n" |
6613 " ändringarna. Om inte, kommer uppdateringen att misslyckas med ett\n" |
6767 "\n" |
6614 " förslag att använda 'merge' eller 'update -C' istället.\n" |
6768 " 3. Med flaggan -C/--clean kommer oarkiverade ändringar att kasseras och\n" |
6615 "\n" |
6769 " arbetskatalogen uppdateras till den begärda ändringen.\n" |
6616 " Om du vill uppdatera bara en fil till en äldre revision, använd revert.\n" |
6770 "\n" |
|
6771 " Använd null som ändring för att radera arbetskatalogen (som 'hg clone\n" |
|
6772 " -U').\n" |
|
6773 "\n" |
|
6774 " Om du vill uppdatera bara en fil till en äldre ändring, använd 'hg\n" |
|
6775 " revert'.\n" |
6617 "\n" |
6776 "\n" |
6618 " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n" |
6777 " Se 'hg help dates' för en lista med giltiga format för -d/--date.\n" |
6619 " " |
6778 " " |
6620 |
6779 |
6621 msgid "cannot specify both -c/--check and -C/--clean" |
6780 msgid "cannot specify both -c/--check and -C/--clean" |