11170 "file. Merge tools are given the two files and the greatest common\n" |
11185 "file. Merge tools are given the two files and the greatest common\n" |
11171 "ancestor of the two file versions, so they can determine the changes\n" |
11186 "ancestor of the two file versions, so they can determine the changes\n" |
11172 "made on both branches." |
11187 "made on both branches." |
11173 msgstr "" |
11188 msgstr "" |
11174 |
11189 |
11175 msgid "The merge tools are used both for :hg:`resolve` and :hg:`merge`." |
11190 msgid "" |
11176 msgstr "" |
11191 "Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n" |
11177 |
11192 ":hg:`backout` and in several extensions." |
11178 msgid "" |
11193 msgstr "" |
11179 "Usually, the merge tool tries to automatically, by combining all the\n" |
11194 |
11180 "non-overlapping changes that occurred separately in the two different\n" |
11195 msgid "" |
11181 "evolutions of the same initial base file. Furthermore, some\n" |
11196 "Usually, the merge tool tries to automatically reconcile the files by\n" |
|
11197 "combining all non-overlapping changes that occurred separately in\n" |
|
11198 "the two different evolutions of the same initial base file. Furthermore, " |
|
11199 "some\n" |
11182 "interactive merge programs make it easier to manually resolve\n" |
11200 "interactive merge programs make it easier to manually resolve\n" |
11183 "conflicting merges, either in a graphical way, or by inserting some\n" |
11201 "conflicting merges, either in a graphical way, or by inserting some\n" |
11184 "conflict markers. Mercurial does not include any interactive merge\n" |
11202 "conflict markers. Mercurial does not include any interactive merge\n" |
11185 "programs but relies on external tools for that. External merge tools\n" |
11203 "programs but relies on external tools for that." |
11186 "and their properties and usage is configured in merge-tools section -\n" |
11204 msgstr "" |
11187 "see hgrc(5)." |
11205 |
11188 msgstr "" |
11206 msgid "" |
11189 |
11207 "Available merge tools\n" |
11190 msgid "" |
11208 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" |
11191 "There are a some internal merge tools which can be used. The internal\n" |
11209 msgstr "" |
|
11210 |
|
11211 msgid "" |
|
11212 "External merge tools and their properties are configured in the\n" |
|
11213 "merge-tools configuration section - see hgrc(5) - but they can often just\n" |
|
11214 "be named by their executable." |
|
11215 msgstr "" |
|
11216 |
|
11217 msgid "" |
|
11218 "A merge tool is generally usable if its executable can be found on the\n" |
|
11219 "system and if it can handle the merge. The executable is found if it\n" |
|
11220 "is an absolute or relative executable path or the name of an\n" |
|
11221 "application in the executable search path. The tool is assumed to be\n" |
|
11222 "able to handle the merge if it can handle symlinks if the file is a\n" |
|
11223 "symlink, if it can handle binary files if the file is binary, and if a\n" |
|
11224 "GUI is available if the tool requires a GUI." |
|
11225 msgstr "" |
|
11226 |
|
11227 msgid "" |
|
11228 "There are some internal merge tools which can be used. The internal\n" |
11192 "merge tools are:" |
11229 "merge tools are:" |
11193 msgstr "" |
11230 msgstr "" |
11194 |
11231 |
11195 msgid "" |
11232 msgid "" |
11196 "``internal:merge``\n" |
11233 "``internal:merge``\n" |
11197 " Uses the internal non-interactive merge tool for merging files." |
11234 " Uses the internal non-interactive simple merge algorithm for merging\n" |
|
11235 " files. It will fail if there are any conflicts and leave markers in\n" |
|
11236 " the partially merged file." |
11198 msgstr "" |
11237 msgstr "" |
11199 |
11238 |
11200 msgid "" |
11239 msgid "" |
11201 "``internal:fail``\n" |
11240 "``internal:fail``\n" |
11202 " Rather than attempting to merge files that were modified on both\n" |
11241 " Rather than attempting to merge files that were modified on both\n" |
11203 " branches, it marks these files as unresolved. Then the resolve\n" |
11242 " branches, it marks them as unresolved. The resolve command must be\n" |
11204 " command must be used to mark files resolved." |
11243 " used to resolve these conflicts." |
11205 msgstr "" |
11244 msgstr "" |
11206 |
11245 |
11207 msgid "" |
11246 msgid "" |
11208 "``internal:local``\n" |
11247 "``internal:local``\n" |
11209 " Uses the local version of files as the merged version." |
11248 " Uses the local version of files as the merged version." |
11210 msgstr "" |
11249 msgstr "" |
11211 |
11250 |
11212 msgid "" |
11251 msgid "" |
11213 "``internal:other``\n" |
11252 "``internal:other``\n" |
11214 " Uses the remote version of files as the merged version." |
11253 " Uses the other version of files as the merged version." |
11215 msgstr "" |
11254 msgstr "" |
11216 |
11255 |
11217 msgid "" |
11256 msgid "" |
11218 "``internal:prompt``\n" |
11257 "``internal:prompt``\n" |
11219 " Asks the user which of the local or the other version to keep as\n" |
11258 " Asks the user which of the local or the other version to keep as\n" |
11222 |
11261 |
11223 msgid "" |
11262 msgid "" |
11224 "``internal:dump``\n" |
11263 "``internal:dump``\n" |
11225 " Creates three versions of the files to merge, containing the\n" |
11264 " Creates three versions of the files to merge, containing the\n" |
11226 " contents of local, other and base. These files can then be used to\n" |
11265 " contents of local, other and base. These files can then be used to\n" |
11227 " perform a merge manually. If the file merged is name ``a.txt``,\n" |
11266 " perform a merge manually. If the file to be merged is named\n" |
11228 " these files will accordingly be named ``a.txt.local``,\n" |
11267 " ``a.txt``, these files will accordingly be named ``a.txt.local``,\n" |
11229 " ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" |
11268 " ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" |
11230 " same directory as the file to merge." |
11269 " same directory as ``a.txt``." |
11231 msgstr "" |
11270 msgstr "" |
11232 |
11271 |
11233 msgid "How Mercurial decides which merge program to use" |
11272 msgid "" |
11234 msgstr "" |
11273 "Internal tools are always available and do not require a GUI but will by " |
11235 |
11274 "default\n" |
11236 msgid "" |
11275 "not handle symlinks or binary files." |
11237 "1. If the ``HGMERGE`` environment variable is present, it is used. If\n" |
11276 msgstr "" |
11238 " specified it must be either an executable path or the name of an\n" |
11277 |
11239 " application in your executable search path." |
11278 msgid "" |
11240 msgstr "" |
11279 "Choosing a merge tool\n" |
11241 |
11280 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" |
11242 msgid "" |
11281 msgstr "" |
11243 "2. If the filename of the file to be merged matches any of the\n" |
11282 |
11244 " patterns in the merge-patterns configuration section, then the\n" |
11283 msgid "Mercurial uses these rules when deciding which merge tool to use:" |
11245 " corresponding merge tool is used, unless the file to be merged is a\n" |
11284 msgstr "" |
11246 " symlink. Here binary capabilities of the merge tool are not\n" |
11285 |
11247 " considered." |
11286 msgid "" |
11248 msgstr "" |
11287 "1. If a tool has been specified with the --tool option to merge or resolve, " |
11249 |
11288 "it\n" |
11250 msgid "3. If ui.merge is set, it is used." |
11289 " is used. If it is the name of a tool in the merge-tools configuration, " |
11251 msgstr "" |
11290 "its\n" |
11252 |
11291 " configuration is used. Otherwise the specified tool must be executable " |
11253 msgid "" |
11292 "by\n" |
11254 "4. If any merge tools are present in the merge-tools configuration\n" |
11293 " the shell." |
11255 " section, and any of the tools can be found on the system, the\n" |
11294 msgstr "" |
11256 " priority settings are used to determine which one to use. Binary,\n" |
11295 |
11257 " symlink and GUI capabilities do also have to match." |
11296 msgid "" |
11258 msgstr "" |
11297 "2. If the ``HGMERGE`` environment variable is present, its value is used " |
11259 |
11298 "and\n" |
11260 msgid "5. If a program named ``hgmerge`` exists on the system, it is used." |
11299 " must be executable by the shell." |
11261 msgstr "" |
11300 msgstr "" |
11262 |
11301 |
11263 msgid "" |
11302 msgid "" |
11264 "6. If the file to be merged is not binary and is not a symlink, then\n" |
11303 "3. If the filename of the file to be merged matches any of the patterns in " |
|
11304 "the\n" |
|
11305 " merge-patterns configuration section, the first usable merge tool\n" |
|
11306 " corresponding to a matching pattern is used. Here, binary capabilities of " |
|
11307 "the\n" |
|
11308 " merge tool are not considered." |
|
11309 msgstr "" |
|
11310 |
|
11311 msgid "" |
|
11312 "4. If ui.merge is set it will be considered next. If the value is not the " |
|
11313 "name\n" |
|
11314 " of a configured tool, the specified value is used and must be executable " |
|
11315 "by\n" |
|
11316 " the shell. Otherwise the named tool is used if it is usable." |
|
11317 msgstr "" |
|
11318 |
|
11319 msgid "" |
|
11320 "5. If any usable merge tools are present in the merge-tools configuration\n" |
|
11321 " section, the one with the highest priority is used." |
|
11322 msgstr "" |
|
11323 |
|
11324 msgid "" |
|
11325 "6. If a program named ``hgmerge`` can be found on the system, it is used - " |
|
11326 "but\n" |
|
11327 " it will by default not be used for symlinks and binary files." |
|
11328 msgstr "" |
|
11329 |
|
11330 msgid "" |
|
11331 "7. If the file to be merged is not binary and is not a symlink, then\n" |
11265 " ``internal:merge`` is used." |
11332 " ``internal:merge`` is used." |
11266 msgstr "" |
11333 msgstr "" |
11267 |
11334 |
11268 msgid "7. The merge fails." |
11335 msgid "8. The merge of the file fails and must be resolved before commit." |
11269 msgstr "" |
11336 msgstr "" |
11270 |
11337 |
11271 msgid "" |
11338 msgid "" |
11272 ".. note::\n" |
11339 ".. note::\n" |
11273 " After selecting a merge program, Mercurial will by default attempt\n" |
11340 " After selecting a merge program, Mercurial will by default attempt\n" |
11274 " to merge the files using a simple merge algorithm first, to see if\n" |
11341 " to merge the files using a simple merge algorithm first. Only if it " |
11275 " they can be merged without conflicts. Only if there are conflicting\n" |
11342 "doesn't\n" |
11276 " changes Mercurial will actually execute the merge program. Whether\n" |
11343 " succeed because of conflicting changes Mercurial will actually execute " |
11277 " to use the simple merge algorithm first can be controlled be the\n" |
11344 "the\n" |
11278 " premerge setting of the merge tool, which is enabled by default\n" |
11345 " merge program. Whether to use the simple merge algorithm first can be\n" |
11279 " unless the file is binary or symlink." |
11346 " controlled by the premerge setting of the merge tool. Premerge is enabled " |
11280 msgstr "" |
11347 "by\n" |
11281 |
11348 " default unless the file is binary or a symlink." |
11282 msgid "" |
11349 msgstr "" |
11283 "See the merge-tools and ui sections of hgrc(5) for details on\n" |
11350 |
|
11351 msgid "" |
|
11352 "See the merge-tools and ui sections of hgrc(5) for details on the\n" |
11284 "configuration of merge tools.\n" |
11353 "configuration of merge tools.\n" |
11285 msgstr "" |
11354 msgstr "" |
11286 |
11355 |
11287 msgid "" |
11356 msgid "" |
11288 "When Mercurial accepts more than one revision, they may be specified\n" |
11357 "When Mercurial accepts more than one revision, they may be specified\n" |
11527 msgstr "" |
11596 msgstr "" |
11528 |
11597 |
11529 msgid "The following predicates are supported:" |
11598 msgid "The following predicates are supported:" |
11530 msgstr "" |
11599 msgstr "" |
11531 |
11600 |
11532 msgid "" |
11601 msgid ".. predicatesmarker" |
11533 "``adds(pattern)``\n" |
|
11534 " Changesets that add a file matching pattern." |
|
11535 msgstr "" |
|
11536 |
|
11537 msgid "" |
|
11538 "``all()``\n" |
|
11539 " All changesets, the same as ``0:tip``." |
|
11540 msgstr "" |
|
11541 |
|
11542 msgid "" |
|
11543 "``ancestor(single, single)``\n" |
|
11544 " Greatest common ancestor of the two changesets." |
|
11545 msgstr "" |
|
11546 |
|
11547 msgid "" |
|
11548 "``ancestors(set)``\n" |
|
11549 " Changesets that are ancestors of a changeset in set." |
|
11550 msgstr "" |
|
11551 |
|
11552 msgid "" |
|
11553 "``author(string)``\n" |
|
11554 " Alias for ``user(string)``." |
|
11555 msgstr "" |
|
11556 |
|
11557 msgid "" |
|
11558 "``branch(set)``\n" |
|
11559 " All changesets belonging to the branches of changesets in set." |
|
11560 msgstr "" |
|
11561 |
|
11562 msgid "" |
|
11563 "``children(set)``\n" |
|
11564 " Child changesets of changesets in set." |
|
11565 msgstr "" |
|
11566 |
|
11567 msgid "" |
|
11568 "``closed()``\n" |
|
11569 " Changeset is closed." |
|
11570 msgstr "" |
|
11571 |
|
11572 msgid "" |
|
11573 "``contains(pattern)``\n" |
|
11574 " Revision contains pattern." |
|
11575 msgstr "" |
|
11576 |
|
11577 msgid "" |
|
11578 "``date(interval)``\n" |
|
11579 " Changesets within the interval, see :hg:`help dates`." |
|
11580 msgstr "" |
|
11581 |
|
11582 msgid "" |
|
11583 "``descendants(set)``\n" |
|
11584 " Changesets which are descendants of changesets in set." |
|
11585 msgstr "" |
|
11586 |
|
11587 msgid "" |
|
11588 "``file(pattern)``\n" |
|
11589 " Changesets affecting files matched by pattern." |
|
11590 msgstr "" |
|
11591 |
|
11592 msgid "" |
|
11593 "``follow()``\n" |
|
11594 " An alias for ``::.`` (ancestors of the working copy's first parent)." |
|
11595 msgstr "" |
|
11596 |
|
11597 msgid "" |
|
11598 "``grep(regex)``\n" |
|
11599 " Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n" |
|
11600 " to ensure special escape characters are handled correctly." |
|
11601 msgstr "" |
|
11602 |
|
11603 msgid "" |
|
11604 "``head()``\n" |
|
11605 " Changeset is a named branch head." |
|
11606 msgstr "" |
|
11607 |
|
11608 msgid "" |
|
11609 "``heads(set)``\n" |
|
11610 " Members of set with no children in set." |
|
11611 msgstr "" |
|
11612 |
|
11613 msgid "" |
|
11614 "``id(string)``\n" |
|
11615 " Revision non-ambiguously specified by the given hex string prefix" |
|
11616 msgstr "" |
|
11617 |
|
11618 msgid "" |
|
11619 "``keyword(string)``\n" |
|
11620 " Search commit message, user name, and names of changed files for\n" |
|
11621 " string." |
|
11622 msgstr "" |
|
11623 |
|
11624 msgid "" |
|
11625 "``limit(set, n)``\n" |
|
11626 " First n members of set." |
|
11627 msgstr "" |
|
11628 |
|
11629 msgid "" |
|
11630 "``max(set)``\n" |
|
11631 " Changeset with highest revision number in set." |
|
11632 msgstr "" |
|
11633 |
|
11634 msgid "" |
|
11635 "``min(set)``\n" |
|
11636 " Changeset with lowest revision number in set." |
|
11637 msgstr "" |
|
11638 |
|
11639 msgid "" |
|
11640 "``merge()``\n" |
|
11641 " Changeset is a merge changeset." |
|
11642 msgstr "" |
|
11643 |
|
11644 msgid "" |
|
11645 "``modifies(pattern)``\n" |
|
11646 " Changesets modifying files matched by pattern." |
|
11647 msgstr "" |
|
11648 |
|
11649 msgid "" |
|
11650 "``outgoing([path])``\n" |
|
11651 " Changesets not found in the specified destination repository, or the\n" |
|
11652 " default push location." |
|
11653 msgstr "" |
|
11654 |
|
11655 msgid "" |
|
11656 "``p1(set)``\n" |
|
11657 " First parent of changesets in set." |
|
11658 msgstr "" |
|
11659 |
|
11660 msgid "" |
|
11661 "``p2(set)``\n" |
|
11662 " Second parent of changesets in set." |
|
11663 msgstr "" |
|
11664 |
|
11665 msgid "" |
|
11666 "``parents(set)``\n" |
|
11667 " The set of all parents for all changesets in set." |
|
11668 msgstr "" |
|
11669 |
|
11670 msgid "" |
|
11671 "``present(set)``\n" |
|
11672 " An empty set, if any revision in set isn't found; otherwise,\n" |
|
11673 " all revisions in set." |
|
11674 msgstr "" |
|
11675 |
|
11676 msgid "" |
|
11677 "``removes(pattern)``\n" |
|
11678 " Changesets which remove files matching pattern." |
|
11679 msgstr "" |
|
11680 |
|
11681 msgid "" |
|
11682 "``rev(number)``\n" |
|
11683 " Revision with the given numeric identifier." |
|
11684 msgstr "" |
|
11685 |
|
11686 msgid "" |
|
11687 "``reverse(set)``\n" |
|
11688 " Reverse order of set." |
|
11689 msgstr "" |
|
11690 |
|
11691 msgid "" |
|
11692 "``roots(set)``\n" |
|
11693 " Changesets with no parent changeset in set." |
|
11694 msgstr "" |
|
11695 |
|
11696 msgid "" |
|
11697 "``sort(set[, [-]key...])``\n" |
|
11698 " Sort set by keys. The default sort order is ascending, specify a key\n" |
|
11699 " as ``-key`` to sort in descending order." |
|
11700 msgstr "" |
|
11701 |
|
11702 msgid " The keys can be:" |
|
11703 msgstr "" |
|
11704 |
|
11705 msgid "" |
|
11706 " - ``rev`` for the revision number,\n" |
|
11707 " - ``branch`` for the branch name,\n" |
|
11708 " - ``desc`` for the commit message (description),\n" |
|
11709 " - ``user`` for user name (``author`` can be used as an alias),\n" |
|
11710 " - ``date`` for the commit date" |
|
11711 msgstr "" |
|
11712 |
|
11713 msgid "" |
|
11714 "``tag(name)``\n" |
|
11715 " The specified tag by name, or all tagged revisions if no name is given." |
|
11716 msgstr "" |
|
11717 |
|
11718 msgid "" |
|
11719 "``user(string)``\n" |
|
11720 " User name is string." |
|
11721 msgstr "" |
11602 msgstr "" |
11722 |
11603 |
11723 msgid "Command line equivalents for :hg:`log`::" |
11604 msgid "Command line equivalents for :hg:`log`::" |
11724 msgstr "" |
11605 msgstr "" |
11725 |
11606 |
11738 msgstr "" |
11619 msgstr "" |
11739 |
11620 |
11740 msgid "- Changesets on the default branch::" |
11621 msgid "- Changesets on the default branch::" |
11741 msgstr "- Ändringar på default-grenen::" |
11622 msgstr "- Ändringar på default-grenen::" |
11742 |
11623 |
11743 msgid " hg log -r 'branch(default)'" |
11624 msgid " hg log -r \"branch(default)\"" |
11744 msgstr " hg log -r 'branch(default)'" |
11625 msgstr " hg log -r \"branch(default)\"" |
11745 |
11626 |
11746 msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" |
11627 msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" |
11747 msgstr "" |
11628 msgstr "" |
11748 |
11629 |
11749 msgid " hg log -r 'branch(default) and 1.5:: and not merge()'" |
11630 msgid " hg log -r \"branch(default) and 1.5:: and not merge()\"" |
11750 msgstr "" |
11631 msgstr " hg log -r \"branch(default) and 1.5:: and not merge()\"" |
11751 |
11632 |
11752 msgid "- Open branch heads::" |
11633 msgid "- Open branch heads::" |
11753 msgstr "- Öppna grenhuvuden::" |
11634 msgstr "- Öppna grenhuvuden::" |
11754 |
11635 |
11755 msgid " hg log -r 'head() and not closed()'" |
11636 msgid " hg log -r \"head() and not closed()\"" |
11756 msgstr "" |
11637 msgstr "" |
11757 |
11638 |
11758 msgid "" |
11639 msgid "" |
11759 "- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" |
11640 "- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" |
11760 " ``hgext/*``::" |
11641 " ``hgext/*``::" |
11761 msgstr "" |
11642 msgstr "" |
11762 |
11643 |
11763 msgid " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'" |
11644 msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\"" |
11764 msgstr "" |
11645 msgstr "" |
11765 |
11646 |
11766 msgid "- Changesets in committed May 2008, sorted by user::" |
11647 msgid "- Changesets in committed May 2008, sorted by user::" |
11767 msgstr "" |
11648 msgstr "" |
11768 |
11649 |
11769 msgid " hg log -r 'sort(date(\"May 2008\"), user)'" |
11650 msgid " hg log -r \"sort(date('May 2008'), user)\"" |
11770 msgstr "" |
11651 msgstr "" |
11771 |
11652 |
11772 msgid "" |
11653 msgid "" |
11773 "- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" |
11654 "- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" |
11774 " release::" |
11655 " release::" |
11775 msgstr "" |
11656 msgstr "" |
11776 |
11657 |
11777 msgid "" |
11658 msgid "" |
11778 " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged" |
11659 " hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged" |
11779 "())'\n" |
11660 "())\"\n" |
|
11661 msgstr "" |
|
11662 |
|
11663 msgid "" |
|
11664 "Subrepositories let you nest external repositories or projects into a\n" |
|
11665 "parent Mercurial repository, and make commands operate on them as a\n" |
|
11666 "group. External Mercurial and Subversion projects are currently\n" |
|
11667 "supported." |
|
11668 msgstr "" |
|
11669 |
|
11670 msgid "Subrepositories are made of three components:" |
|
11671 msgstr "" |
|
11672 |
|
11673 msgid "" |
|
11674 "1. Nested repository checkouts. They can appear anywhere in the\n" |
|
11675 " parent working directory, and are Mercurial clones or Subversion\n" |
|
11676 " checkouts." |
|
11677 msgstr "" |
|
11678 |
|
11679 msgid "" |
|
11680 "2. Nested repository references. They are defined in ``.hgsub`` and\n" |
|
11681 " tell where the subrepository checkouts come from. Mercurial\n" |
|
11682 " subrepositories are referenced like:" |
|
11683 msgstr "" |
|
11684 |
|
11685 msgid " path/to/nested = https://example.com/nested/repo/path" |
|
11686 msgstr "" |
|
11687 |
|
11688 msgid "" |
|
11689 " where ``path/to/nested`` is the checkout location relatively to the\n" |
|
11690 " parent Mercurial root, and ``https://example.com/nested/repo/path``\n" |
|
11691 " is the source repository path. The source can also reference a\n" |
|
11692 " filesystem path. Subversion repositories are defined with:" |
|
11693 msgstr "" |
|
11694 |
|
11695 msgid " path/to/nested = [svn]https://example.com/nested/trunk/path" |
|
11696 msgstr "" |
|
11697 |
|
11698 msgid "" |
|
11699 " Note that ``.hgsub`` does not exist by default in Mercurial\n" |
|
11700 " repositories, you have to create and add it to the parent\n" |
|
11701 " repository before using subrepositories." |
|
11702 msgstr "" |
|
11703 |
|
11704 msgid "" |
|
11705 "3. Nested repository states. They are defined in ``.hgsubstate`` and\n" |
|
11706 " capture whatever information is required to restore the\n" |
|
11707 " subrepositories to the state they were committed in a parent\n" |
|
11708 " repository changeset. Mercurial automatically record the nested\n" |
|
11709 " repositories states when committing in the parent repository." |
|
11710 msgstr "" |
|
11711 |
|
11712 msgid "" |
|
11713 " .. note::\n" |
|
11714 " The ``.hgsubstate`` file should not be edited manually." |
|
11715 msgstr "" |
|
11716 |
|
11717 msgid "" |
|
11718 "\n" |
|
11719 "Adding a Subrepository\n" |
|
11720 "----------------------" |
|
11721 msgstr "" |
|
11722 |
|
11723 msgid "" |
|
11724 "If ``.hgsub`` does not exist, create it and add it to the parent\n" |
|
11725 "repository. Clone or checkout the external projects where you want it\n" |
|
11726 "to live in the parent repository. Edit ``.hgsub`` and add the\n" |
|
11727 "subrepository entry as described above. At this point, the\n" |
|
11728 "subrepository is tracked and the next commit will record its state in\n" |
|
11729 "``.hgsubstate`` and bind it to the committed changeset." |
|
11730 msgstr "" |
|
11731 |
|
11732 msgid "" |
|
11733 "Synchronizing a Subrepository\n" |
|
11734 "-----------------------------" |
|
11735 msgstr "" |
|
11736 |
|
11737 msgid "" |
|
11738 "Subrepos do not automatically track the latest changeset of their\n" |
|
11739 "sources. Instead, they are updated to the changeset that corresponds\n" |
|
11740 "with the changeset checked out in the top-level changeset. This is so\n" |
|
11741 "developers always get a consistent set of compatible code and\n" |
|
11742 "libraries when they update." |
|
11743 msgstr "" |
|
11744 |
|
11745 msgid "" |
|
11746 "Thus, updating subrepos is a manual process. Simply check out target\n" |
|
11747 "subrepo at the desired revision, test in the top-level repo, then\n" |
|
11748 "commit in the parent repository to record the new combination." |
|
11749 msgstr "" |
|
11750 |
|
11751 msgid "" |
|
11752 "Deleting a Subrepository\n" |
|
11753 "------------------------" |
|
11754 msgstr "" |
|
11755 |
|
11756 msgid "" |
|
11757 "To remove a subrepository from the parent repository, delete its\n" |
|
11758 "reference from ``.hgsub``, then remove its files." |
|
11759 msgstr "" |
|
11760 |
|
11761 msgid "" |
|
11762 "Interaction with Mercurial Commands\n" |
|
11763 "-----------------------------------" |
|
11764 msgstr "" |
|
11765 |
|
11766 msgid "" |
|
11767 ":add: add does not recurse in subrepos unless -S/--subrepos is\n" |
|
11768 " specified. Subversion subrepositories are currently silently\n" |
|
11769 " ignored." |
|
11770 msgstr "" |
|
11771 |
|
11772 msgid "" |
|
11773 ":archive: archive does not recurse in subrepositories unless\n" |
|
11774 " -S/--subrepos is specified." |
|
11775 msgstr "" |
|
11776 |
|
11777 msgid "" |
|
11778 ":commit: commit creates a consistent snapshot of the state of the\n" |
|
11779 " entire project and its subrepositories. It does this by first\n" |
|
11780 " attempting to commit all modified subrepositories, then recording\n" |
|
11781 " their state and finally committing it in the parent repository." |
|
11782 msgstr "" |
|
11783 |
|
11784 msgid "" |
|
11785 ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n" |
|
11786 " specified. Changes are displayed as usual, on the subrepositories\n" |
|
11787 " elements. Subversion subrepositories are currently silently\n" |
|
11788 " ignored." |
|
11789 msgstr "" |
|
11790 |
|
11791 msgid "" |
|
11792 ":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n" |
|
11793 " is specified. Subversion subrepositories are currently silently\n" |
|
11794 " ignored." |
|
11795 msgstr "" |
|
11796 |
|
11797 msgid "" |
|
11798 ":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n" |
|
11799 " is specified. Subversion subrepositories are currently silently\n" |
|
11800 " ignored." |
|
11801 msgstr "" |
|
11802 |
|
11803 msgid "" |
|
11804 ":pull: pull is not recursive since it is not clear what to pull prior\n" |
|
11805 " to running :hg:`update`. Listing and retrieving all\n" |
|
11806 " subrepositories changes referenced by the parent repository pulled\n" |
|
11807 " changesets is expensive at best, impossible in the Subversion\n" |
|
11808 " case." |
|
11809 msgstr "" |
|
11810 |
|
11811 msgid "" |
|
11812 ":push: Mercurial will automatically push all subrepositories first\n" |
|
11813 " when the parent repository is being pushed. This ensures new\n" |
|
11814 " subrepository changes are available when referenced by top-level\n" |
|
11815 " repositories." |
|
11816 msgstr "" |
|
11817 |
|
11818 msgid "" |
|
11819 ":status: status does not recurse into subrepositories unless\n" |
|
11820 " -S/--subrepos is specified. Subrepository changes are displayed as\n" |
|
11821 " regular Mercurial changes on the subrepository\n" |
|
11822 " elements. Subversion subrepositories are currently silently\n" |
|
11823 " ignored." |
|
11824 msgstr "" |
|
11825 |
|
11826 msgid "" |
|
11827 ":update: update restores the subrepos in the state they were\n" |
|
11828 " originally committed in target changeset. If the recorded\n" |
|
11829 " changeset is not available in the current subrepository, Mercurial\n" |
|
11830 " will pull it in first before updating. This means that updating\n" |
|
11831 " can require network access when using subrepositories." |
|
11832 msgstr "" |
|
11833 |
|
11834 msgid "" |
|
11835 "Remapping Subrepositories Sources\n" |
|
11836 "---------------------------------" |
|
11837 msgstr "" |
|
11838 |
|
11839 msgid "" |
|
11840 "A subrepository source location may change during a project life,\n" |
|
11841 "invalidating references stored in the parent repository history. To\n" |
|
11842 "fix this, rewriting rules can be defined in parent repository ``hgrc``\n" |
|
11843 "file or in Mercurial configuration. See the ``[subpaths]`` section in\n" |
|
11844 "hgrc(5) for more details." |
11780 msgstr "" |
11845 msgstr "" |
11781 |
11846 |
11782 msgid "" |
11847 msgid "" |
11783 "Mercurial allows you to customize output of commands through\n" |
11848 "Mercurial allows you to customize output of commands through\n" |
11784 "templates. You can either pass in a template from the command\n" |
11849 "templates. You can either pass in a template from the command\n" |
12854 |
12919 |
12855 #, python-format |
12920 #, python-format |
12856 msgid "not a function: %s" |
12921 msgid "not a function: %s" |
12857 msgstr "inte en funktion: %s" |
12922 msgstr "inte en funktion: %s" |
12858 |
12923 |
|
12924 msgid "" |
|
12925 "``id(string)``\n" |
|
12926 " Revision non-ambiguously specified by the given hex string prefix." |
|
12927 msgstr "" |
|
12928 |
|
12929 #. i18n: "id" is a keyword |
12859 msgid "id requires one argument" |
12930 msgid "id requires one argument" |
12860 msgstr "id kräver ett argument" |
12931 msgstr "id kräver ett argument" |
12861 |
12932 |
|
12933 #. i18n: "id" is a keyword |
12862 msgid "id requires a string" |
12934 msgid "id requires a string" |
12863 msgstr "id kräver en sträng" |
12935 msgstr "id kräver en sträng" |
12864 |
12936 |
|
12937 msgid "" |
|
12938 "``rev(number)``\n" |
|
12939 " Revision with the given numeric identifier." |
|
12940 msgstr "" |
|
12941 |
|
12942 #. i18n: "rev" is a keyword |
12865 msgid "rev requires one argument" |
12943 msgid "rev requires one argument" |
12866 msgstr "rev kräver ett argument" |
12944 msgstr "rev kräver ett argument" |
12867 |
12945 |
|
12946 #. i18n: "rev" is a keyword |
12868 msgid "rev requires a number" |
12947 msgid "rev requires a number" |
12869 msgstr "rev kräver ett nummer" |
12948 msgstr "rev kräver ett nummer" |
12870 |
12949 |
|
12950 #. i18n: "rev" is a keyword |
12871 msgid "rev expects a number" |
12951 msgid "rev expects a number" |
12872 msgstr "rev förväntar sig ett nummer" |
12952 msgstr "rev förväntar sig ett nummer" |
12873 |
12953 |
|
12954 msgid "" |
|
12955 "``p1(set)``\n" |
|
12956 " First parent of changesets in set." |
|
12957 msgstr "" |
|
12958 |
|
12959 msgid "" |
|
12960 "``p2(set)``\n" |
|
12961 " Second parent of changesets in set." |
|
12962 msgstr "" |
|
12963 |
|
12964 msgid "" |
|
12965 "``parents(set)``\n" |
|
12966 " The set of all parents for all changesets in set." |
|
12967 msgstr "" |
|
12968 |
|
12969 msgid "" |
|
12970 "``max(set)``\n" |
|
12971 " Changeset with highest revision number in set." |
|
12972 msgstr "" |
|
12973 |
|
12974 msgid "" |
|
12975 "``min(set)``\n" |
|
12976 " Changeset with lowest revision number in set." |
|
12977 msgstr "" |
|
12978 |
|
12979 msgid "" |
|
12980 "``limit(set, n)``\n" |
|
12981 " First n members of set." |
|
12982 msgstr "" |
|
12983 |
|
12984 #. i18n: "limit" is a keyword |
12874 msgid "limit requires two arguments" |
12985 msgid "limit requires two arguments" |
12875 msgstr "limit kräver två argument" |
12986 msgstr "limit kräver två argument" |
12876 |
12987 |
|
12988 #. i18n: "limit" is a keyword |
12877 msgid "limit requires a number" |
12989 msgid "limit requires a number" |
12878 msgstr "limit kräver ett nummer" |
12990 msgstr "limit kräver ett nummer" |
12879 |
12991 |
|
12992 #. i18n: "limit" is a keyword |
12880 msgid "limit expects a number" |
12993 msgid "limit expects a number" |
12881 msgstr "limit förväntar sig ett nummer" |
12994 msgstr "limit förväntar sig ett nummer" |
12882 |
12995 |
|
12996 msgid "" |
|
12997 "``children(set)``\n" |
|
12998 " Child changesets of changesets in set." |
|
12999 msgstr "" |
|
13000 |
|
13001 msgid "" |
|
13002 "``branch(set)``\n" |
|
13003 " All changesets belonging to the branches of changesets in set." |
|
13004 msgstr "" |
|
13005 |
|
13006 msgid "" |
|
13007 "``ancestor(single, single)``\n" |
|
13008 " Greatest common ancestor of the two changesets." |
|
13009 msgstr "" |
|
13010 |
|
13011 #. i18n: "ancestor" is a keyword |
12883 msgid "ancestor requires two arguments" |
13012 msgid "ancestor requires two arguments" |
12884 msgstr "ancestor kräver två argument" |
13013 msgstr "ancestor kräver två argument" |
12885 |
13014 |
|
13015 #. i18n: "ancestor" is a keyword |
12886 msgid "ancestor arguments must be single revisions" |
13016 msgid "ancestor arguments must be single revisions" |
12887 msgstr "argument till ancestor måste vara singelrevisioner" |
13017 msgstr "argument till ancestor måste vara singelrevisioner" |
12888 |
13018 |
|
13019 msgid "" |
|
13020 "``ancestors(set)``\n" |
|
13021 " Changesets that are ancestors of a changeset in set." |
|
13022 msgstr "" |
|
13023 |
|
13024 msgid "" |
|
13025 "``descendants(set)``\n" |
|
13026 " Changesets which are descendants of changesets in set." |
|
13027 msgstr "" |
|
13028 |
|
13029 msgid "" |
|
13030 "``follow()``\n" |
|
13031 " An alias for ``::.`` (ancestors of the working copy's first parent)." |
|
13032 msgstr "" |
|
13033 |
|
13034 #. i18n: "follow" is a keyword |
12889 msgid "follow takes no arguments" |
13035 msgid "follow takes no arguments" |
12890 msgstr "follow tar inga argument" |
13036 msgstr "follow tar inga argument" |
12891 |
13037 |
|
13038 msgid "" |
|
13039 "``date(interval)``\n" |
|
13040 " Changesets within the interval, see :hg:`help dates`." |
|
13041 msgstr "" |
|
13042 |
|
13043 #. i18n: "date" is a keyword |
12892 msgid "date requires a string" |
13044 msgid "date requires a string" |
12893 msgstr "date kräver en sträng" |
13045 msgstr "date kräver en sträng" |
12894 |
13046 |
|
13047 msgid "" |
|
13048 "``keyword(string)``\n" |
|
13049 " Search commit message, user name, and names of changed files for\n" |
|
13050 " string." |
|
13051 msgstr "" |
|
13052 |
|
13053 #. i18n: "keyword" is a keyword |
12895 msgid "keyword requires a string" |
13054 msgid "keyword requires a string" |
12896 msgstr "keyword kräver en sträng" |
13055 msgstr "keyword kräver en sträng" |
12897 |
13056 |
|
13057 msgid "" |
|
13058 "``grep(regex)``\n" |
|
13059 " Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n" |
|
13060 " to ensure special escape characters are handled correctly." |
|
13061 msgstr "" |
|
13062 |
|
13063 #. i18n: "grep" is a keyword |
12898 msgid "grep requires a string" |
13064 msgid "grep requires a string" |
12899 msgstr "grep kräver en sträng" |
13065 msgstr "grep kräver en sträng" |
12900 |
13066 |
12901 #, python-format |
13067 #, python-format |
12902 msgid "invalid match pattern: %s" |
13068 msgid "invalid match pattern: %s" |
12903 msgstr "ogiltigt träffmönster: %s" |
13069 msgstr "ogiltigt träffmönster: %s" |
12904 |
13070 |
|
13071 msgid "" |
|
13072 "``author(string)``\n" |
|
13073 " Alias for ``user(string)``." |
|
13074 msgstr "" |
|
13075 |
|
13076 #. i18n: "author" is a keyword |
12905 msgid "author requires a string" |
13077 msgid "author requires a string" |
12906 msgstr "author kräver en sträng" |
13078 msgstr "author kräver en sträng" |
12907 |
13079 |
|
13080 msgid "" |
|
13081 "``user(string)``\n" |
|
13082 " User name is string." |
|
13083 msgstr "" |
|
13084 |
|
13085 msgid "" |
|
13086 "``file(pattern)``\n" |
|
13087 " Changesets affecting files matched by pattern." |
|
13088 msgstr "" |
|
13089 |
|
13090 #. i18n: "file" is a keyword |
12908 msgid "file requires a pattern" |
13091 msgid "file requires a pattern" |
12909 msgstr "file kräver ett mönster" |
13092 msgstr "file kräver ett mönster" |
12910 |
13093 |
|
13094 msgid "" |
|
13095 "``contains(pattern)``\n" |
|
13096 " Revision contains pattern." |
|
13097 msgstr "" |
|
13098 |
|
13099 #. i18n: "contains" is a keyword |
12911 msgid "contains requires a pattern" |
13100 msgid "contains requires a pattern" |
12912 msgstr "contains kräver ett mönster" |
13101 msgstr "contains kräver ett mönster" |
12913 |
13102 |
|
13103 msgid "" |
|
13104 "``modifies(pattern)``\n" |
|
13105 " Changesets modifying files matched by pattern." |
|
13106 msgstr "" |
|
13107 |
|
13108 #. i18n: "modifies" is a keyword |
12914 msgid "modifies requires a pattern" |
13109 msgid "modifies requires a pattern" |
12915 msgstr "modifies kräver ett mönster" |
13110 msgstr "modifies kräver ett mönster" |
12916 |
13111 |
|
13112 msgid "" |
|
13113 "``adds(pattern)``\n" |
|
13114 " Changesets that add a file matching pattern." |
|
13115 msgstr "" |
|
13116 |
|
13117 #. i18n: "adds" is a keyword |
12917 msgid "adds requires a pattern" |
13118 msgid "adds requires a pattern" |
12918 msgstr "adds kräver ett mönster" |
13119 msgstr "adds kräver ett mönster" |
12919 |
13120 |
|
13121 msgid "" |
|
13122 "``removes(pattern)``\n" |
|
13123 " Changesets which remove files matching pattern." |
|
13124 msgstr "" |
|
13125 |
|
13126 #. i18n: "removes" is a keyword |
12920 msgid "removes requires a pattern" |
13127 msgid "removes requires a pattern" |
12921 msgstr "removes kräver ett mänster" |
13128 msgstr "removes kräver ett mänster" |
12922 |
13129 |
|
13130 msgid "" |
|
13131 "``merge()``\n" |
|
13132 " Changeset is a merge changeset." |
|
13133 msgstr "" |
|
13134 |
|
13135 #. i18n: "merge" is a keyword |
12923 msgid "merge takes no arguments" |
13136 msgid "merge takes no arguments" |
12924 msgstr "merge tar inga argument" |
13137 msgstr "merge tar inga argument" |
12925 |
13138 |
|
13139 msgid "" |
|
13140 "``closed()``\n" |
|
13141 " Changeset is closed." |
|
13142 msgstr "" |
|
13143 |
|
13144 #. i18n: "closed" is a keyword |
12926 msgid "closed takes no arguments" |
13145 msgid "closed takes no arguments" |
12927 msgstr "closed tar inga argument" |
13146 msgstr "closed tar inga argument" |
12928 |
13147 |
|
13148 msgid "" |
|
13149 "``head()``\n" |
|
13150 " Changeset is a named branch head." |
|
13151 msgstr "" |
|
13152 |
|
13153 #. i18n: "head" is a keyword |
12929 msgid "head takes no arguments" |
13154 msgid "head takes no arguments" |
12930 msgstr "head tar inga argument" |
13155 msgstr "head tar inga argument" |
12931 |
13156 |
|
13157 msgid "" |
|
13158 "``reverse(set)``\n" |
|
13159 " Reverse order of set." |
|
13160 msgstr "" |
|
13161 |
|
13162 msgid "" |
|
13163 "``present(set)``\n" |
|
13164 " An empty set, if any revision in set isn't found; otherwise,\n" |
|
13165 " all revisions in set." |
|
13166 msgstr "" |
|
13167 |
|
13168 msgid "" |
|
13169 "``sort(set[, [-]key...])``\n" |
|
13170 " Sort set by keys. The default sort order is ascending, specify a key\n" |
|
13171 " as ``-key`` to sort in descending order." |
|
13172 msgstr "" |
|
13173 |
|
13174 msgid " The keys can be:" |
|
13175 msgstr "" |
|
13176 |
|
13177 msgid "" |
|
13178 " - ``rev`` for the revision number,\n" |
|
13179 " - ``branch`` for the branch name,\n" |
|
13180 " - ``desc`` for the commit message (description),\n" |
|
13181 " - ``user`` for user name (``author`` can be used as an alias),\n" |
|
13182 " - ``date`` for the commit date" |
|
13183 msgstr "" |
|
13184 |
|
13185 #. i18n: "sort" is a keyword |
12932 msgid "sort requires one or two arguments" |
13186 msgid "sort requires one or two arguments" |
12933 msgstr "sort kräver ett eller två argument" |
13187 msgstr "sort kräver ett eller två argument" |
12934 |
13188 |
12935 msgid "sort spec must be a string" |
13189 msgid "sort spec must be a string" |
12936 msgstr "sort-spec måste vara en sträng" |
13190 msgstr "sort-spec måste vara en sträng" |
12937 |
13191 |
12938 #, python-format |
13192 #, python-format |
12939 msgid "unknown sort key %r" |
13193 msgid "unknown sort key %r" |
12940 msgstr "okänd sorteringsnyckel %r" |
13194 msgstr "okänd sorteringsnyckel %r" |
12941 |
13195 |
|
13196 msgid "" |
|
13197 "``all()``\n" |
|
13198 " All changesets, the same as ``0:tip``." |
|
13199 msgstr "" |
|
13200 |
|
13201 #. i18n: "all" is a keyword |
12942 msgid "all takes no arguments" |
13202 msgid "all takes no arguments" |
12943 msgstr "all tar inga argument" |
13203 msgstr "all tar inga argument" |
12944 |
13204 |
|
13205 msgid "" |
|
13206 "``heads(set)``\n" |
|
13207 " Members of set with no children in set." |
|
13208 msgstr "" |
|
13209 |
|
13210 msgid "" |
|
13211 "``roots(set)``\n" |
|
13212 " Changesets with no parent changeset in set." |
|
13213 msgstr "" |
|
13214 |
|
13215 msgid "" |
|
13216 "``outgoing([path])``\n" |
|
13217 " Changesets not found in the specified destination repository, or the\n" |
|
13218 " default push location." |
|
13219 msgstr "" |
|
13220 |
|
13221 #. i18n: "outgoing" is a keyword |
12945 msgid "outgoing requires a repository path" |
13222 msgid "outgoing requires a repository path" |
12946 msgstr "outgoing kräver en arkivsökväg" |
13223 msgstr "outgoing kräver en arkivsökväg" |
12947 |
13224 |
|
13225 msgid "" |
|
13226 "``tag(name)``\n" |
|
13227 " The specified tag by name, or all tagged revisions if no name is given." |
|
13228 msgstr "" |
|
13229 |
|
13230 #. i18n: "tag" is a keyword |
12948 msgid "tag takes one or no arguments" |
13231 msgid "tag takes one or no arguments" |
12949 msgstr "tag tar ett eller inga argument" |
13232 msgstr "tag tar ett eller inga argument" |
12950 |
13233 |
|
13234 #. i18n: "tag" is a keyword |
12951 msgid "the argument to tag must be a string" |
13235 msgid "the argument to tag must be a string" |
12952 msgstr "argumentet till tag måste vara en sträng" |
13236 msgstr "argumentet till tag måste vara en sträng" |
12953 |
13237 |
12954 msgid "can't negate that" |
13238 msgid "can't negate that" |
12955 msgstr "kan inte negera det" |
13239 msgstr "kan inte negera det" |