642
642
"The target branch will not have its working tree populated because this\n"
643
643
"is both expensive and is not supported on remote file systems."
645
#: bzrlib/builtins.py:1257
647
"Some smart servers or protocols *may* put the working tree in place in\n"
650
"Some smart servers or protocols *may* put the working tree in place in\n"
653
#: bzrlib/builtins.py:1260
655
"This command only works on branches that have not diverged. Branches are\n"
656
"considered diverged if the destination branch's most recent commit is one\n"
657
"that has not been merged (directly or indirectly) by the source branch."
659
"This command only works on branches that have not diverged. Branches are\n"
660
"considered diverged if the destination branch's most recent commit is one\n"
661
"that has not been merged (directly or indirectly) by the source branch."
663
#: bzrlib/builtins.py:1264
665
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
666
"the other branch completely, discarding its unmerged changes."
668
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
669
"the other branch completely, discarding its unmerged changes."
671
#: bzrlib/builtins.py:1267
673
"If you want to ensure you have the different changes in the other branch,\n"
674
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
675
"After that you will be able to do a push without '--overwrite'."
677
"If you want to ensure you have the different changes in the other branch,\n"
678
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
679
"After that you will be able to do a push without '--overwrite'."
681
#: bzrlib/builtins.py:1271
683
"If there is no default push location set, the first push will set it (use\n"
684
"--no-remember to avoid setting it). After that, you can omit the\n"
685
"location to use the default. To change the default, use --remember. The\n"
686
"value will only be saved if the remote location can be accessed."
688
"If there is no default push location set, the first push will set it (use\n"
689
"--no-remember to avoid setting it). After that, you can omit the\n"
690
"location to use the default. To change the default, use --remember. The\n"
691
"value will only be saved if the remote location can be accessed."
645
#: bzrlib/builtins.py:1266
647
"Some smart servers or protocols *may* put the working tree in place in\n"
650
"Some smart servers or protocols *may* put the working tree in place in\n"
653
#: bzrlib/builtins.py:1269
655
"This command only works on branches that have not diverged. Branches are\n"
656
"considered diverged if the destination branch's most recent commit is one\n"
657
"that has not been merged (directly or indirectly) by the source branch."
659
"This command only works on branches that have not diverged. Branches are\n"
660
"considered diverged if the destination branch's most recent commit is one\n"
661
"that has not been merged (directly or indirectly) by the source branch."
663
#: bzrlib/builtins.py:1273
665
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
666
"the other branch completely, discarding its unmerged changes."
668
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
669
"the other branch completely, discarding its unmerged changes."
693
671
#: bzrlib/builtins.py:1276
673
"If you want to ensure you have the different changes in the other branch,\n"
674
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
675
"After that you will be able to do a push without '--overwrite'."
677
"If you want to ensure you have the different changes in the other branch,\n"
678
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
679
"After that you will be able to do a push without '--overwrite'."
681
#: bzrlib/builtins.py:1280
683
"If there is no default push location set, the first push will set it (use\n"
684
"--no-remember to avoid setting it). After that, you can omit the\n"
685
"location to use the default. To change the default, use --remember. The\n"
686
"value will only be saved if the remote location can be accessed."
688
"If there is no default push location set, the first push will set it (use\n"
689
"--no-remember to avoid setting it). After that, you can omit the\n"
690
"location to use the default. To change the default, use --remember. The\n"
691
"value will only be saved if the remote location can be accessed."
693
#: bzrlib/builtins.py:1285
695
695
"The --verbose option will display the revisions pushed using the log_format\n"
696
696
"configuration option. You can use a different format by overriding it with\n"
697
697
"-Olog_format=<other_format>."
700
#: bzrlib/builtins.py:1287 bzrlib/foreign.py:272
702
"Branch to push from, rather than the one containing the working directory."
704
"Branch to push from, rather than the one containing the working directory."
706
#: bzrlib/builtins.py:1290
708
"By default push will fail if the target directory exists, but does not "
709
"already have a control directory. This flag will allow push to proceed."
711
"By default push will fail if the target directory exists, but does not "
712
"already have a control directory. This flag will allow push to proceed."
714
#: bzrlib/builtins.py:1295
716
"Create a stacked branch that references the public location of the parent "
719
"Create a stacked branch that references the public location of the parent "
722
#: bzrlib/builtins.py:1298
700
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
702
"Branch to push from, rather than the one containing the working directory."
704
"Branch to push from, rather than the one containing the working directory."
706
#: bzrlib/builtins.py:1299
708
"By default push will fail if the target directory exists, but does not "
709
"already have a control directory. This flag will allow push to proceed."
711
"By default push will fail if the target directory exists, but does not "
712
"already have a control directory. This flag will allow push to proceed."
714
#: bzrlib/builtins.py:1304
716
"Create a stacked branch that references the public location of the parent "
719
"Create a stacked branch that references the public location of the parent "
722
#: bzrlib/builtins.py:1307
724
724
"Create a stacked branch that refers to another branch for the commit "
725
725
"history. Only the work not present in the referenced branch is included in "
726
726
"the branch created."
729
#: bzrlib/builtins.py:1303 bzrlib/foreign.py:279
729
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
731
731
"Refuse to push if there are uncommitted changes in the working tree, --no-"
732
732
"strict disables the check."
735
#: bzrlib/builtins.py:1306
735
#: bzrlib/builtins.py:1315
736
736
msgid "Don't populate the working tree, even for protocols that support it."
739
#: bzrlib/builtins.py:1350
739
#: bzrlib/builtins.py:1318
740
msgid "Overwrite tags only."
743
#: bzrlib/builtins.py:1369
740
744
msgid "Could not determine branch to refer to."
743
#: bzrlib/builtins.py:1359
747
#: bzrlib/builtins.py:1378
746
750
"No push location known or specified. To push to the parent branch (at %s), "
773
777
"create ./foo-bar."
776
#: bzrlib/builtins.py:1388
780
#: bzrlib/builtins.py:1407
778
782
"To retrieve the branch as of a particular revision, supply the --revision\n"
779
783
"parameter, as in \"branch foo/bar -r 5\"."
782
#: bzrlib/builtins.py:1391
786
#: bzrlib/builtins.py:1410
783
787
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
786
#: bzrlib/builtins.py:1401
790
#: bzrlib/builtins.py:1420
787
791
msgid "Create a branch without a working-tree."
790
#: bzrlib/builtins.py:1403
794
#: bzrlib/builtins.py:1422
791
795
msgid "Switch the checkout in the current directory to the new branch."
794
#: bzrlib/builtins.py:1406
798
#: bzrlib/builtins.py:1425
796
800
"Create a stacked branch referring to the source branch. The new branch will "
797
801
"depend on the availability of the source branch for all operations."
800
#: bzrlib/builtins.py:1410
804
#: bzrlib/builtins.py:1429
801
805
msgid "Do not use a shared repository, even if available."
804
#: bzrlib/builtins.py:1412
808
#: bzrlib/builtins.py:1431
806
810
"By default branch will fail if the target directory exists, but does not "
807
811
"already have a control directory. This flag will allow branch to proceed."
810
#: bzrlib/builtins.py:1417
814
#: bzrlib/builtins.py:1436
811
815
msgid "Bind new branch to from location."
814
#: bzrlib/builtins.py:1464
818
#: bzrlib/builtins.py:1483
816
820
msgid "Target directory \"%s\" already exists."
819
#: bzrlib/builtins.py:1476
823
#: bzrlib/builtins.py:1495
821
825
msgid "Parent of \"%s\" does not exist."
824
#: bzrlib/builtins.py:1495
828
#: bzrlib/builtins.py:1514
825
829
msgid "The branch {0} has no revision {1}."
828
#: bzrlib/builtins.py:1510 bzrlib/push.py:53
832
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
830
834
msgid "Created new stacked branch referring to %s."
833
#: bzrlib/builtins.py:1514
837
#: bzrlib/builtins.py:1533
835
839
msgid "Branched %d revision."
836
840
msgid_plural "Branched %d revisions."
840
#: bzrlib/builtins.py:1519
844
#: bzrlib/builtins.py:1538
842
846
msgid "New branch bound to %s"
845
#: bzrlib/builtins.py:1524 bzrlib/builtins.py:6247
849
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
847
851
msgid "Switched to branch: %s"
850
#: bzrlib/builtins.py:1529
854
#: bzrlib/builtins.py:1548
851
855
msgid "List the branches available at the current location."
854
#: bzrlib/builtins.py:1531
858
#: bzrlib/builtins.py:1550
856
860
"This command will print the names of all the branches at the current\n"
860
#: bzrlib/builtins.py:1538
864
#: bzrlib/builtins.py:1557
862
866
"Recursively scan for branches rather than just looking in the specified "
866
#: bzrlib/builtins.py:1567
870
#: bzrlib/builtins.py:1586
867
871
msgid "(default)"
868
872
msgstr "(default)"
870
#: bzrlib/builtins.py:1579
874
#: bzrlib/builtins.py:1598
871
875
msgid "Create a new checkout of an existing branch."
874
#: bzrlib/builtins.py:1581
878
#: bzrlib/builtins.py:1600
876
880
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
966
970
"out the old content of that file to a new location."
969
#: bzrlib/builtins.py:1705
973
#: bzrlib/builtins.py:1724
971
975
"The 'dir' argument, if given, must be the location of the root of a\n"
972
976
"working tree to update. By default, the working tree that contains the \n"
973
977
"current working directory is used."
976
#: bzrlib/builtins.py:1721
980
#: bzrlib/builtins.py:1740
977
981
msgid "bzr update --revision takes exactly one revision"
980
#: bzrlib/builtins.py:1729
984
#: bzrlib/builtins.py:1748
981
985
msgid "bzr update can only update a whole tree, not a file or subdirectory"
984
#: bzrlib/builtins.py:1760
988
#: bzrlib/builtins.py:1779
985
989
msgid "Tree is up to date at revision {0} of branch {1}"
988
#: bzrlib/builtins.py:1776
992
#: bzrlib/builtins.py:1795
991
995
"branch has no revision %s\n"
992
996
"bzr update --revision only works for a revision in the branch history"
995
#: bzrlib/builtins.py:1782
999
#: bzrlib/builtins.py:1801
996
1000
msgid "Updated to revision {0} of branch {1}"
999
#: bzrlib/builtins.py:1786
1003
#: bzrlib/builtins.py:1805
1001
1005
"Your local commits will now show as pending merges with 'bzr status', and "
1002
1006
"can be committed with 'bzr commit'."
1005
#: bzrlib/builtins.py:1795
1009
#: bzrlib/builtins.py:1814
1006
1010
msgid "Show information about a working tree, branch or repository."
1009
#: bzrlib/builtins.py:1797
1013
#: bzrlib/builtins.py:1816
1011
1015
"This command will show all known locations and formats associated to the\n"
1012
1016
"tree, branch or repository."
1015
#: bzrlib/builtins.py:1800
1019
#: bzrlib/builtins.py:1819
1017
1021
"In verbose mode, statistical information is included with each report.\n"
1018
1022
"To see extended statistic information, use a verbosity level of 2 or\n"
1019
1023
"higher by specifying the verbose option multiple times, e.g. -vv."
1022
#: bzrlib/builtins.py:1804
1026
#: bzrlib/builtins.py:1823
1023
1027
msgid "Branches and working trees will also report any missing revisions."
1026
#: bzrlib/builtins.py:1806 bzrlib/builtins.py:3725 bzrlib/builtins.py:4859
1027
#: bzrlib/builtins.py:6433
1030
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1031
#: bzrlib/builtins.py:6466
1028
1032
msgid ":Examples:"
1031
#: bzrlib/builtins.py:1808
1035
#: bzrlib/builtins.py:1827
1032
1036
msgid " Display information on the format and related locations:"
1035
#: bzrlib/builtins.py:1810
1039
#: bzrlib/builtins.py:1829
1036
1040
msgid " bzr info"
1039
#: bzrlib/builtins.py:1812
1043
#: bzrlib/builtins.py:1831
1041
1045
" Display the above together with extended format information and\n"
1042
1046
" basic statistics (like the number of files in the working tree and\n"
1043
1047
" number of revisions in the branch and repository):"
1046
#: bzrlib/builtins.py:1816
1050
#: bzrlib/builtins.py:1835
1047
1051
msgid " bzr info -v"
1050
#: bzrlib/builtins.py:1818
1054
#: bzrlib/builtins.py:1837
1051
1055
msgid " Display the above together with number of committers to the branch:"
1054
#: bzrlib/builtins.py:1820
1058
#: bzrlib/builtins.py:1839
1055
1059
msgid " bzr info -vv"
1058
#: bzrlib/builtins.py:1839
1062
#: bzrlib/builtins.py:1858
1059
1063
msgid "Remove files or directories."
1062
#: bzrlib/builtins.py:1841
1066
#: bzrlib/builtins.py:1860
1064
1068
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1065
1069
"delete them if they can easily be recovered using revert otherwise they\n"
1066
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1070
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1067
1071
"parameters are given Bazaar will scan for files that are being tracked by\n"
1068
1072
"Bazaar but missing in your tree and stop tracking them for you."
1071
#: bzrlib/builtins.py:1849
1075
#: bzrlib/builtins.py:1868
1072
1076
msgid "Only remove files that have never been committed."
1075
#: bzrlib/builtins.py:1851
1079
#: bzrlib/builtins.py:1870
1076
1080
msgid "The file deletion mode to be used."
1079
#: bzrlib/builtins.py:1852
1083
#: bzrlib/builtins.py:1871
1080
1084
msgid "Deletion Strategy"
1083
#: bzrlib/builtins.py:1853
1087
#: bzrlib/builtins.py:1872
1084
1088
msgid "Backup changed files (default)."
1087
#: bzrlib/builtins.py:1854
1091
#: bzrlib/builtins.py:1873
1088
1092
msgid "Delete from bzr but leave the working copy."
1091
#: bzrlib/builtins.py:1855
1095
#: bzrlib/builtins.py:1874
1092
1096
msgid "Don't backup changed files."
1095
#: bzrlib/builtins.py:1856
1099
#: bzrlib/builtins.py:1875
1097
1101
"Delete all the specified files, even if they can not be recovered and even "
1098
1102
"if they are non-empty directories. (deprecated, use no-backup)"
1101
#: bzrlib/builtins.py:1865
1105
#: bzrlib/builtins.py:1884
1102
1106
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1105
#: bzrlib/builtins.py:1882
1109
#: bzrlib/builtins.py:1901
1106
1110
msgid "No matching files."
1109
#: bzrlib/builtins.py:1943
1113
#: bzrlib/builtins.py:1962
1110
1114
msgid "Reconcile bzr metadata in a branch."
1113
#: bzrlib/builtins.py:1945
1117
#: bzrlib/builtins.py:1964
1115
1119
"This can correct data mismatches that may have been caused by\n"
1116
1120
"previous ghost operations or bzr upgrades. You should only\n"
1190
1194
" bzr commit -m \"imported project\""
1193
#: bzrlib/builtins.py:2052
1197
#: bzrlib/builtins.py:2071
1195
1199
"Create the path leading up to the branch if it does not already exist."
1198
#: bzrlib/builtins.py:2055
1202
#: bzrlib/builtins.py:2074
1199
1203
msgid "Specify a format for this branch. See \"help formats\"."
1202
#: bzrlib/builtins.py:2063
1206
#: bzrlib/builtins.py:2082
1204
1208
"Never change revnos or the existing log. Append revisions to it only."
1207
#: bzrlib/builtins.py:2066
1211
#: bzrlib/builtins.py:2085
1208
1212
msgid "Create a branch without a working tree."
1211
#: bzrlib/builtins.py:2086 bzrlib/push.py:110
1215
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1212
1216
#, python-format
1214
1218
"Parent directory of %s does not exist.\n"
1215
1219
"You may supply --create-prefix to create all leading parent directories."
1218
#: bzrlib/builtins.py:2120
1222
#: bzrlib/builtins.py:2139
1220
1224
"This branch format cannot be set to append-revisions-only. Try --default."
1223
#: bzrlib/builtins.py:2131
1227
#: bzrlib/builtins.py:2150
1224
1228
msgid "Created a {0} (format: {1})\n"
1227
#: bzrlib/builtins.py:2140
1231
#: bzrlib/builtins.py:2159
1228
1232
#, python-format
1229
1233
msgid "Using shared repository: %s\n"
1232
#: bzrlib/builtins.py:2144
1236
#: bzrlib/builtins.py:2163
1233
1237
msgid "Create a shared repository for branches to share storage space."
1236
#: bzrlib/builtins.py:2146
1240
#: bzrlib/builtins.py:2165
1238
1242
"New branches created under the repository directory will store their\n"
1239
1243
"revisions in the repository, not in the branch directory. For branches\n"
1326
1330
" 0 - no change"
1329
#: bzrlib/builtins.py:2231
1333
#: bzrlib/builtins.py:2250
1332
1336
" Shows the difference in the working tree versus the last commit::"
1335
#: bzrlib/builtins.py:2234
1339
#: bzrlib/builtins.py:2253
1336
1340
msgid " bzr diff"
1339
#: bzrlib/builtins.py:2236
1343
#: bzrlib/builtins.py:2255
1340
1344
msgid " Difference between the working tree and revision 1::"
1343
#: bzrlib/builtins.py:2238
1347
#: bzrlib/builtins.py:2257
1344
1348
msgid " bzr diff -r1"
1347
#: bzrlib/builtins.py:2240
1351
#: bzrlib/builtins.py:2259
1348
1352
msgid " Difference between revision 3 and revision 1::"
1351
#: bzrlib/builtins.py:2242
1355
#: bzrlib/builtins.py:2261
1352
1356
msgid " bzr diff -r1..3"
1355
#: bzrlib/builtins.py:2244
1359
#: bzrlib/builtins.py:2263
1356
1360
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1359
#: bzrlib/builtins.py:2246
1363
#: bzrlib/builtins.py:2265
1360
1364
msgid " bzr diff -r1..3 xxx"
1363
#: bzrlib/builtins.py:2248
1367
#: bzrlib/builtins.py:2267
1364
1368
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1367
#: bzrlib/builtins.py:2250
1371
#: bzrlib/builtins.py:2269
1368
1372
msgid " bzr diff -c2"
1371
#: bzrlib/builtins.py:2252
1375
#: bzrlib/builtins.py:2271
1373
1377
" To see the changes introduced by revision X::\n"
1375
1379
" bzr diff -cX"
1378
#: bzrlib/builtins.py:2256
1382
#: bzrlib/builtins.py:2275
1380
1384
" Note that in the case of a merge, the -c option shows the changes\n"
1381
1385
" compared to the left hand parent. To see the changes against\n"
1382
1386
" another parent, use::"
1385
#: bzrlib/builtins.py:2260
1389
#: bzrlib/builtins.py:2279
1386
1390
msgid " bzr diff -r<chosen_parent>..X"
1389
#: bzrlib/builtins.py:2262
1393
#: bzrlib/builtins.py:2281
1391
1395
" The changes between the current revision and the previous revision\n"
1392
1396
" (equivalent to -c-1 and -r-2..-1)"
1395
#: bzrlib/builtins.py:2265
1399
#: bzrlib/builtins.py:2284
1396
1400
msgid " bzr diff -r-2.."
1399
#: bzrlib/builtins.py:2267
1403
#: bzrlib/builtins.py:2286
1400
1404
msgid " Show just the differences for file NEWS::"
1403
#: bzrlib/builtins.py:2269
1407
#: bzrlib/builtins.py:2288
1404
1408
msgid " bzr diff NEWS"
1407
#: bzrlib/builtins.py:2271
1411
#: bzrlib/builtins.py:2290
1408
1412
msgid " Show the differences in working tree xxx for file NEWS::"
1411
#: bzrlib/builtins.py:2273
1415
#: bzrlib/builtins.py:2292
1412
1416
msgid " bzr diff xxx/NEWS"
1415
#: bzrlib/builtins.py:2275
1419
#: bzrlib/builtins.py:2294
1416
1420
msgid " Show the differences from branch xxx to this working tree:"
1419
#: bzrlib/builtins.py:2277
1423
#: bzrlib/builtins.py:2296
1420
1424
msgid " bzr diff --old xxx"
1423
#: bzrlib/builtins.py:2279
1427
#: bzrlib/builtins.py:2298
1424
1428
msgid " Show the differences between two branches for file NEWS::"
1427
#: bzrlib/builtins.py:2281
1431
#: bzrlib/builtins.py:2300
1428
1432
msgid " bzr diff --old xxx --new yyy NEWS"
1431
#: bzrlib/builtins.py:2283
1435
#: bzrlib/builtins.py:2302
1432
1436
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1435
#: bzrlib/builtins.py:2285
1439
#: bzrlib/builtins.py:2304
1437
1441
" bzr diff --prefix old/:new/\n"
1441
1445
" bzr diff --using /usr/bin/diff --diff-options -wu"
1444
#: bzrlib/builtins.py:2295
1448
#: bzrlib/builtins.py:2314
1445
1449
msgid "Pass these options to the external diff program."
1448
#: bzrlib/builtins.py:2298
1452
#: bzrlib/builtins.py:2317
1450
1454
"Set prefixes added to old and new filenames, as two values separated by a "
1451
1455
"colon. (eg \"old/:new/\")."
1454
#: bzrlib/builtins.py:2301
1458
#: bzrlib/builtins.py:2320
1455
1459
msgid "Branch/tree to compare from."
1458
#: bzrlib/builtins.py:2305
1462
#: bzrlib/builtins.py:2324
1459
1463
msgid "Branch/tree to compare to."
1462
#: bzrlib/builtins.py:2311
1466
#: bzrlib/builtins.py:2330
1463
1467
msgid "Use this command to compare files."
1466
#: bzrlib/builtins.py:2316
1470
#: bzrlib/builtins.py:2335
1467
1471
msgid "Diff format to use."
1470
#: bzrlib/builtins.py:2318
1474
#: bzrlib/builtins.py:2337
1471
1475
msgid "Diff format"
1474
#: bzrlib/builtins.py:2340
1478
#: bzrlib/builtins.py:2359
1475
1479
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1478
#: bzrlib/builtins.py:2344
1482
#: bzrlib/builtins.py:2363
1479
1483
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1482
#: bzrlib/builtins.py:2349 bzrlib/builtins.py:2746 bzrlib/builtins.py:2759
1483
#: bzrlib/builtins.py:2767 bzrlib/builtins.py:4933
1486
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1487
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1484
1488
msgid "{0} and {1} are mutually exclusive"
1487
#: bzrlib/builtins.py:2369
1491
#: bzrlib/builtins.py:2388
1489
1493
"List files deleted in the working tree.\n"
1493
#: bzrlib/builtins.py:2446
1497
#: bzrlib/builtins.py:2465
1494
1498
msgid "Show the tree root directory."
1497
#: bzrlib/builtins.py:2448
1501
#: bzrlib/builtins.py:2467
1499
1503
"The root is the nearest enclosing directory with a .bzr control\n"
1503
#: bzrlib/builtins.py:2463
1507
#: bzrlib/builtins.py:2482
1504
1508
msgid "The limit argument must be an integer."
1507
#: bzrlib/builtins.py:2471
1511
#: bzrlib/builtins.py:2490
1508
1512
msgid "The levels argument must be an integer."
1511
#: bzrlib/builtins.py:2476
1515
#: bzrlib/builtins.py:2495
1512
1516
msgid "Show historical log for a branch or subset of a branch."
1515
#: bzrlib/builtins.py:2478
1519
#: bzrlib/builtins.py:2497
1517
1521
"log is bzr's default tool for exploring the history of a branch.\n"
1518
1522
"The branch to use is taken from the first parameter. If no parameters\n"
1634
1638
" a nested merge revision and the log will be truncated accordingly."
1637
#: bzrlib/builtins.py:2552
1641
#: bzrlib/builtins.py:2571
1638
1642
msgid ":Path filtering:"
1641
#: bzrlib/builtins.py:2554
1645
#: bzrlib/builtins.py:2573
1643
1647
" If parameters are given and the first one is not a branch, the log\n"
1644
1648
" will be filtered to show only those revisions that changed the\n"
1645
1649
" nominated files or directories."
1648
#: bzrlib/builtins.py:2558
1652
#: bzrlib/builtins.py:2577
1650
1654
" Filenames are interpreted within their historical context. To log a\n"
1651
1655
" deleted file, specify a revision range so that the file existed at\n"
1652
1656
" the end or start of the range."
1655
#: bzrlib/builtins.py:2562
1659
#: bzrlib/builtins.py:2581
1657
1661
" Historical context is also important when interpreting pathnames of\n"
1658
1662
" renamed files/directories. Consider the following example:"
1661
#: bzrlib/builtins.py:2565
1665
#: bzrlib/builtins.py:2584
1663
1667
" * revision 1: add tutorial.txt\n"
1664
1668
" * revision 2: modify tutorial.txt\n"
1665
1669
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1668
#: bzrlib/builtins.py:2569
1672
#: bzrlib/builtins.py:2588
1669
1673
msgid " In this case:"
1672
#: bzrlib/builtins.py:2571
1676
#: bzrlib/builtins.py:2590
1673
1677
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1676
#: bzrlib/builtins.py:2573
1680
#: bzrlib/builtins.py:2592
1678
1682
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1681
#: bzrlib/builtins.py:2575
1685
#: bzrlib/builtins.py:2594
1683
1687
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1684
1688
" the original file in revision 2."
1687
#: bzrlib/builtins.py:2578
1691
#: bzrlib/builtins.py:2597
1689
1693
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1690
1694
" was no file called guide.txt in revision 2."
1693
#: bzrlib/builtins.py:2581
1697
#: bzrlib/builtins.py:2600
1695
1699
" Renames are always followed by log. By design, there is no need to\n"
1696
1700
" explicitly ask for this (and no way to stop logging a file back\n"
1697
1701
" until it was last renamed)."
1700
#: bzrlib/builtins.py:2585
1704
#: bzrlib/builtins.py:2604
1701
1705
msgid ":Other filtering:"
1704
#: bzrlib/builtins.py:2587
1708
#: bzrlib/builtins.py:2606
1706
1710
" The --match option can be used for finding revisions that match a\n"
1707
1711
" regular expression in a commit message, committer, author or bug.\n"
1773
1777
" trading disk space for faster speed."
1776
#: bzrlib/builtins.py:2634
1780
#: bzrlib/builtins.py:2653
1777
1781
msgid "Show from oldest to newest."
1780
#: bzrlib/builtins.py:2637
1784
#: bzrlib/builtins.py:2656
1781
1785
msgid "Show files changed in each revision."
1784
#: bzrlib/builtins.py:2643
1788
#: bzrlib/builtins.py:2662
1785
1789
msgid "Show just the specified revision. See also \"help revisionspec\"."
1788
#: bzrlib/builtins.py:2647
1792
#: bzrlib/builtins.py:2666
1789
1793
msgid "What names to list as authors - first, all or committer."
1792
#: bzrlib/builtins.py:2648
1796
#: bzrlib/builtins.py:2667
1793
1797
msgid "Authors"
1796
#: bzrlib/builtins.py:2653
1800
#: bzrlib/builtins.py:2672
1797
1801
msgid "Number of levels to display - 0 for all, 1 for flat."
1800
#: bzrlib/builtins.py:2663
1804
#: bzrlib/builtins.py:2682
1801
1805
msgid "Limit the output to the first N revisions."
1804
#: bzrlib/builtins.py:2668
1808
#: bzrlib/builtins.py:2687
1805
1809
msgid "Show changes made in each revision as a patch."
1808
#: bzrlib/builtins.py:2670
1812
#: bzrlib/builtins.py:2689
1809
1813
msgid "Show merged revisions like --levels 0 does."
1812
#: bzrlib/builtins.py:2674
1816
#: bzrlib/builtins.py:2693
1813
1817
msgid "Do not report commits with more than one parent."
1816
#: bzrlib/builtins.py:2676
1820
#: bzrlib/builtins.py:2695
1818
1822
"Display only the revisions that are not part of both ancestries (require -"
1822
#: bzrlib/builtins.py:2680
1826
#: bzrlib/builtins.py:2699
1823
1827
msgid "Show digital signature validity."
1826
#: bzrlib/builtins.py:2683
1830
#: bzrlib/builtins.py:2702
1827
1831
msgid "Show revisions whose properties match this expression."
1830
#: bzrlib/builtins.py:2687
1834
#: bzrlib/builtins.py:2706
1831
1835
msgid "Show revisions whose message matches this expression."
1834
#: bzrlib/builtins.py:2691
1838
#: bzrlib/builtins.py:2710
1835
1839
msgid "Show revisions whose committer matches this expression."
1838
#: bzrlib/builtins.py:2695
1842
#: bzrlib/builtins.py:2714
1839
1843
msgid "Show revisions whose authors match this expression."
1842
#: bzrlib/builtins.py:2699
1846
#: bzrlib/builtins.py:2718
1843
1847
msgid "Show revisions whose bugs match this expression."
1846
#: bzrlib/builtins.py:2753
1850
#: bzrlib/builtins.py:2772
1847
1851
msgid "--exclude-common-ancestry requires -r with two revisions"
1850
#: bzrlib/builtins.py:2781
1854
#: bzrlib/builtins.py:2800
1851
1855
#, python-format
1852
1856
msgid "Path unknown at end or start of revision range: %s"
1855
#: bzrlib/builtins.py:2898
1859
#: bzrlib/builtins.py:2917
1856
1860
#, python-format
1857
1861
msgid "bzr %s doesn't accept two revisions in different branches."
1860
#: bzrlib/builtins.py:2914
1864
#: bzrlib/builtins.py:2933
1861
1865
#, python-format
1862
1866
msgid "bzr %s --revision takes one or two values."
1865
#: bzrlib/builtins.py:2959
1869
#: bzrlib/builtins.py:2978
1867
1871
"List files in a tree.\n"
1871
#: bzrlib/builtins.py:2968
1875
#: bzrlib/builtins.py:2987
1872
1876
msgid "Recurse into subdirectories."
1875
#: bzrlib/builtins.py:2970
1879
#: bzrlib/builtins.py:2989
1876
1880
msgid "Print paths relative to the root of the branch."
1879
#: bzrlib/builtins.py:2972
1883
#: bzrlib/builtins.py:2991
1880
1884
msgid "Print unknown files."
1883
#: bzrlib/builtins.py:2973
1887
#: bzrlib/builtins.py:2992
1884
1888
msgid "Print versioned files."
1887
#: bzrlib/builtins.py:2976
1891
#: bzrlib/builtins.py:2995
1888
1892
msgid "Print ignored files."
1891
#: bzrlib/builtins.py:2978
1895
#: bzrlib/builtins.py:2997
1892
1896
msgid "List entries of a particular kind: file, directory, symlink."
1895
#: bzrlib/builtins.py:2991
1899
#: bzrlib/builtins.py:3010
1896
1900
msgid "invalid kind specified"
1899
#: bzrlib/builtins.py:2994
1903
#: bzrlib/builtins.py:3013
1900
1904
msgid "Cannot set both --verbose and --null"
1903
#: bzrlib/builtins.py:3003
1907
#: bzrlib/builtins.py:3022
1904
1908
msgid "cannot specify both --from-root and PATH"
1907
#: bzrlib/builtins.py:3090
1911
#: bzrlib/builtins.py:3109
1908
1912
msgid "Ignore specified files or patterns."
1911
#: bzrlib/builtins.py:3092
1915
#: bzrlib/builtins.py:3111
1912
1916
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1915
#: bzrlib/builtins.py:3094
1919
#: bzrlib/builtins.py:3113
1917
1921
"If a .bzrignore file does not exist, the ignore command\n"
1918
1922
"will create one and add the specified files or patterns to the newly\n"
1959
1963
" the shell on Unix."
1962
#: bzrlib/builtins.py:3123
1966
#: bzrlib/builtins.py:3142
1964
1968
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1965
1969
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1968
#: bzrlib/builtins.py:3126
1972
#: bzrlib/builtins.py:3145
1971
1975
" Ignore the top level Makefile::"
1974
#: bzrlib/builtins.py:3129
1978
#: bzrlib/builtins.py:3148
1975
1979
msgid " bzr ignore ./Makefile"
1978
#: bzrlib/builtins.py:3131
1982
#: bzrlib/builtins.py:3150
1979
1983
msgid " Ignore .class files in all directories...::"
1982
#: bzrlib/builtins.py:3133
1986
#: bzrlib/builtins.py:3152
1983
1987
msgid " bzr ignore \"*.class\""
1986
#: bzrlib/builtins.py:3135
1990
#: bzrlib/builtins.py:3154
1987
1991
msgid " ...but do not ignore \"special.class\"::"
1990
#: bzrlib/builtins.py:3137
1994
#: bzrlib/builtins.py:3156
1991
1995
msgid " bzr ignore \"!special.class\""
1994
#: bzrlib/builtins.py:3139
1998
#: bzrlib/builtins.py:3158
1995
1999
msgid " Ignore files whose name begins with the \"#\" character::"
1998
#: bzrlib/builtins.py:3141
2002
#: bzrlib/builtins.py:3160
1999
2003
msgid " bzr ignore \"RE:^#\""
2002
#: bzrlib/builtins.py:3143 bzrlib/builtins.py:3147
2006
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2003
2007
msgid " Ignore .o files under the lib directory::"
2006
#: bzrlib/builtins.py:3145
2010
#: bzrlib/builtins.py:3164
2007
2011
msgid " bzr ignore \"lib/**/*.o\""
2010
#: bzrlib/builtins.py:3149
2014
#: bzrlib/builtins.py:3168
2011
2015
msgid " bzr ignore \"RE:lib/.*\\.o\""
2014
#: bzrlib/builtins.py:3151
2018
#: bzrlib/builtins.py:3170
2015
2019
msgid " Ignore everything but the \"debian\" toplevel directory::"
2018
#: bzrlib/builtins.py:3153
2022
#: bzrlib/builtins.py:3172
2020
2024
" bzr ignore \"RE:(?!debian/).*\"\n"
2059
#: bzrlib/builtins.py:3219
2063
#: bzrlib/builtins.py:3238
2060
2064
msgid "List ignored files and the patterns that matched them."
2063
#: bzrlib/builtins.py:3221
2067
#: bzrlib/builtins.py:3240
2065
2069
"List all the ignored files and the ignore pattern that caused the file to\n"
2069
#: bzrlib/builtins.py:3224
2073
#: bzrlib/builtins.py:3243
2070
2074
msgid "Alternatively, to list just the files::"
2073
#: bzrlib/builtins.py:3226
2077
#: bzrlib/builtins.py:3245
2074
2078
msgid " bzr ls --ignored"
2077
#: bzrlib/builtins.py:3260
2081
#: bzrlib/builtins.py:3279
2078
2082
#, python-format
2079
2083
msgid "not a valid revision-number: %r"
2082
#: bzrlib/builtins.py:3267
2086
#: bzrlib/builtins.py:3286
2084
2088
"Export current or past revision to a destination directory or archive."
2087
#: bzrlib/builtins.py:3269
2091
#: bzrlib/builtins.py:3288
2088
2092
msgid "If no revision is specified this exports the last committed revision."
2091
#: bzrlib/builtins.py:3271
2095
#: bzrlib/builtins.py:3290
2093
2097
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2094
2098
"given, try to find the format with the extension. If no extension\n"
2095
2099
"is found exports to a directory (equivalent to --format=dir)."
2098
#: bzrlib/builtins.py:3275
2102
#: bzrlib/builtins.py:3294
2100
2104
"If root is supplied, it will be used as the root directory inside\n"
2101
2105
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2102
2106
"to the exported filename. The root option has no effect for 'dir' format."
2105
#: bzrlib/builtins.py:3279
2109
#: bzrlib/builtins.py:3298
2107
2111
"If branch is omitted then the branch containing the current working\n"
2108
2112
"directory will be used."
2111
#: bzrlib/builtins.py:3282
2115
#: bzrlib/builtins.py:3301
2113
2117
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2116
#: bzrlib/builtins.py:3284
2120
#: bzrlib/builtins.py:3303
2118
2122
" ================= =========================\n"
2119
2123
" Supported formats Autodetected by extension\n"
2126
2130
" ================= ========================="
2129
#: bzrlib/builtins.py:3298
2133
#: bzrlib/builtins.py:3317
2130
2134
msgid "Type of file to export to."
2133
#: bzrlib/builtins.py:3301
2137
#: bzrlib/builtins.py:3320
2134
2138
msgid "Apply content filters to export the convenient form."
2137
#: bzrlib/builtins.py:3305
2141
#: bzrlib/builtins.py:3324
2138
2142
msgid "Name of the root directory inside the exported file."
2141
#: bzrlib/builtins.py:3307
2145
#: bzrlib/builtins.py:3326
2143
2147
"Set modification time of files to that of the last revision in which it was "
2147
#: bzrlib/builtins.py:3310
2151
#: bzrlib/builtins.py:3329
2149
2153
"Export the working tree contents rather than that of the last revision."
2152
#: bzrlib/builtins.py:3329
2156
#: bzrlib/builtins.py:3348
2153
2157
msgid "--uncommitted requires a working tree"
2156
#: bzrlib/builtins.py:3338
2160
#: bzrlib/builtins.py:3357
2157
2161
#, python-format
2158
2162
msgid "Unsupported export format: %s"
2161
#: bzrlib/builtins.py:3342
2165
#: bzrlib/builtins.py:3361
2163
2167
"Write the contents of a file as of a given revision to standard output."
2166
#: bzrlib/builtins.py:3344
2170
#: bzrlib/builtins.py:3363
2167
2171
msgid "If no revision is nominated, the last revision is used."
2170
#: bzrlib/builtins.py:3346
2174
#: bzrlib/builtins.py:3365
2172
2176
"Note: Take care to redirect standard output when using this command on a\n"
2176
#: bzrlib/builtins.py:3352
2180
#: bzrlib/builtins.py:3371
2177
2181
msgid "The path name in the old tree."
2180
#: bzrlib/builtins.py:3353
2184
#: bzrlib/builtins.py:3372
2181
2185
msgid "Apply content filters to display the convenience form."
2184
#: bzrlib/builtins.py:3364
2188
#: bzrlib/builtins.py:3383
2185
2189
msgid "bzr cat --revision takes exactly one revision specifier"
2188
#: bzrlib/builtins.py:3389 bzrlib/builtins.py:3401
2192
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2189
2193
msgid "{0!r} is not present in revision {1}"
2192
#: bzrlib/builtins.py:3424
2196
#: bzrlib/builtins.py:3443
2193
2197
msgid "Commit changes into a new revision."
2196
#: bzrlib/builtins.py:3426
2200
#: bzrlib/builtins.py:3445
2198
2202
"An explanatory message needs to be given for each commit. This is\n"
2199
2203
"often done by using the --message option (getting the message from the\n"
2282
2286
" one or more bugs. See ``bzr help bugs`` for details."
2285
#: bzrlib/builtins.py:3484
2289
#: bzrlib/builtins.py:3503
2286
2290
msgid "Do not consider changes made to a given path."
2289
#: bzrlib/builtins.py:3487
2293
#: bzrlib/builtins.py:3506
2290
2294
msgid "Description of the new revision."
2293
#: bzrlib/builtins.py:3490
2297
#: bzrlib/builtins.py:3509
2294
2298
msgid "Commit even if nothing has changed."
2297
#: bzrlib/builtins.py:3494
2301
#: bzrlib/builtins.py:3513
2298
2302
msgid "Take commit message from this file."
2301
#: bzrlib/builtins.py:3496
2305
#: bzrlib/builtins.py:3515
2302
2306
msgid "Refuse to commit if there are unknown files in the working tree."
2305
#: bzrlib/builtins.py:3499
2309
#: bzrlib/builtins.py:3518
2307
2311
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2308
2312
"08:00:00 +0100'."
2311
#: bzrlib/builtins.py:3502
2315
#: bzrlib/builtins.py:3521
2312
2316
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2315
#: bzrlib/builtins.py:3505
2319
#: bzrlib/builtins.py:3524
2316
2320
msgid "Set the author's name, if it's different from the committer."
2319
#: bzrlib/builtins.py:3508
2323
#: bzrlib/builtins.py:3527
2321
2325
"Perform a local commit in a bound branch. Local commits are not pushed to "
2322
2326
"the master branch until a normal commit is performed."
2325
#: bzrlib/builtins.py:3514
2329
#: bzrlib/builtins.py:3533
2327
2331
"When no message is supplied, show the diff along with the status summary in "
2328
2332
"the message editor."
2331
#: bzrlib/builtins.py:3517
2335
#: bzrlib/builtins.py:3536
2333
2337
"When committing to a foreign version control system do not push data that "
2334
2338
"can not be natively represented."
2337
#: bzrlib/builtins.py:3535
2341
#: bzrlib/builtins.py:3554
2338
2342
#, python-format
2340
2344
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2350
2354
"Commit refused."
2353
#: bzrlib/builtins.py:3553
2357
#: bzrlib/builtins.py:3572
2354
2358
#, python-format
2355
2359
msgid "Unrecognized bug %s. Commit refused."
2358
#: bzrlib/builtins.py:3556
2362
#: bzrlib/builtins.py:3575
2359
2363
#, python-format
2362
2366
"Commit refused."
2365
#: bzrlib/builtins.py:3580
2369
#: bzrlib/builtins.py:3599
2366
2370
msgid "Could not parse --commit-time: "
2369
#: bzrlib/builtins.py:3620
2373
#: bzrlib/builtins.py:3639
2370
2374
msgid "please specify either --message or --file"
2373
#: bzrlib/builtins.py:3649
2377
#: bzrlib/builtins.py:3668
2374
2378
msgid "please specify a commit message with either --message or --file"
2377
#: bzrlib/builtins.py:3652
2381
#: bzrlib/builtins.py:3671
2379
2383
"Empty commit message specified. Please specify a commit message with either -"
2380
2384
"-message or --file or leave a blank message with --message \"\"."
2383
#: bzrlib/builtins.py:3672
2387
#: bzrlib/builtins.py:3691
2385
2389
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2386
2390
"-unchanged to force an empty commit."
2389
#: bzrlib/builtins.py:3676
2393
#: bzrlib/builtins.py:3695
2391
2395
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2392
2396
"resolve FILE\" to resolve."
2395
#: bzrlib/builtins.py:3680
2399
#: bzrlib/builtins.py:3699
2396
2400
msgid "Commit refused because there are unknown files in the working tree."
2399
#: bzrlib/builtins.py:3683
2403
#: bzrlib/builtins.py:3702
2402
2406
"To commit to master branch, run update and then commit.\n"
2403
2407
"You can also pass --local to commit to continue working disconnected."
2406
#: bzrlib/builtins.py:3691
2410
#: bzrlib/builtins.py:3710
2408
2412
"Validate working tree structure, branch consistency and repository history."
2411
#: bzrlib/builtins.py:3693
2415
#: bzrlib/builtins.py:3712
2413
2417
"This command checks various invariants about branch and repository storage\n"
2414
2418
"to detect data corruption or bzr bugs."
2417
#: bzrlib/builtins.py:3696
2421
#: bzrlib/builtins.py:3715
2419
2423
"The working tree and branch checks will only give output if a problem is\n"
2420
2424
"detected. The output fields of the repository check are:"
2423
#: bzrlib/builtins.py:3699
2427
#: bzrlib/builtins.py:3718
2426
2430
" This is just the number of revisions checked. It doesn't\n"
2427
2431
" indicate a problem."
2430
#: bzrlib/builtins.py:3703
2434
#: bzrlib/builtins.py:3722
2432
2436
"versionedfiles\n"
2433
2437
" This is just the number of versionedfiles checked. It\n"
2434
2438
" doesn't indicate a problem."
2437
#: bzrlib/builtins.py:3707
2441
#: bzrlib/builtins.py:3726
2439
2443
"unreferenced ancestors\n"
2440
2444
" Texts that are ancestors of other texts, but\n"
2458
2462
" indicate a problem."
2461
#: bzrlib/builtins.py:3722
2465
#: bzrlib/builtins.py:3741
2463
2467
"If no restrictions are specified, all Bazaar data that is found at the "
2465
2469
"location will be checked."
2468
#: bzrlib/builtins.py:3727
2472
#: bzrlib/builtins.py:3746
2469
2473
msgid " Check the tree and branch at 'foo'::"
2472
#: bzrlib/builtins.py:3729
2476
#: bzrlib/builtins.py:3748
2473
2477
msgid " bzr check --tree --branch foo"
2476
#: bzrlib/builtins.py:3731
2480
#: bzrlib/builtins.py:3750
2477
2481
msgid " Check only the repository at 'bar'::"
2480
#: bzrlib/builtins.py:3733
2484
#: bzrlib/builtins.py:3752
2481
2485
msgid " bzr check --repo bar"
2484
#: bzrlib/builtins.py:3735
2488
#: bzrlib/builtins.py:3754
2485
2489
msgid " Check everything at 'baz'::"
2488
#: bzrlib/builtins.py:3737
2492
#: bzrlib/builtins.py:3756
2489
2493
msgid " bzr check baz"
2492
#: bzrlib/builtins.py:3743
2496
#: bzrlib/builtins.py:3762
2493
2497
msgid "Check the branch related to the current directory."
2496
#: bzrlib/builtins.py:3745
2500
#: bzrlib/builtins.py:3764
2497
2501
msgid "Check the repository related to the current directory."
2500
#: bzrlib/builtins.py:3747
2504
#: bzrlib/builtins.py:3766
2501
2505
msgid "Check the working tree related to the current directory."
2504
#: bzrlib/builtins.py:3761
2508
#: bzrlib/builtins.py:3780
2505
2509
msgid "Upgrade a repository, branch or working tree to a newer format."
2508
#: bzrlib/builtins.py:3763
2512
#: bzrlib/builtins.py:3782
2510
2514
"When the default format has changed after a major new release of\n"
2511
2515
"Bazaar, you may be informed during certain operations that you\n"
2546
#: bzrlib/builtins.py:3789
2550
#: bzrlib/builtins.py:3808
2548
2552
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2549
2553
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2552
#: bzrlib/builtins.py:3797
2556
#: bzrlib/builtins.py:3816
2553
2557
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2556
#: bzrlib/builtins.py:3801
2560
#: bzrlib/builtins.py:3820
2557
2561
msgid "Branch format"
2560
#: bzrlib/builtins.py:3803
2564
#: bzrlib/builtins.py:3822
2561
2565
msgid "Remove the backup.bzr directory if successful."
2564
#: bzrlib/builtins.py:3805
2568
#: bzrlib/builtins.py:3824
2565
2569
msgid "Show what would be done, but don't actually do anything."
2568
#: bzrlib/builtins.py:3820
2572
#: bzrlib/builtins.py:3839
2569
2573
msgid "Show or set bzr user id."
2572
#: bzrlib/builtins.py:3822
2576
#: bzrlib/builtins.py:3841
2575
2579
" Show the email of the current user::"
2578
#: bzrlib/builtins.py:3825
2582
#: bzrlib/builtins.py:3844
2579
2583
msgid " bzr whoami --email"
2582
#: bzrlib/builtins.py:3827
2586
#: bzrlib/builtins.py:3846
2583
2587
msgid " Set the current user::"
2586
#: bzrlib/builtins.py:3829
2590
#: bzrlib/builtins.py:3848
2587
2591
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2590
#: bzrlib/builtins.py:3833
2594
#: bzrlib/builtins.py:3852
2591
2595
msgid "Display email address only."
2594
#: bzrlib/builtins.py:3835
2598
#: bzrlib/builtins.py:3854
2595
2599
msgid "Set identity for the current branch instead of globally."
2598
#: bzrlib/builtins.py:3861
2602
#: bzrlib/builtins.py:3880
2599
2603
msgid "--email can only be used to display existing identity"
2602
#: bzrlib/builtins.py:3885
2606
#: bzrlib/builtins.py:3904
2603
2607
msgid "Print or set the branch nickname."
2606
#: bzrlib/builtins.py:3887
2610
#: bzrlib/builtins.py:3906
2608
2612
"If unset, the colocated branch name is used for colocated branches, and\n"
2609
2613
"the branch directory name is used for other branches. To print the\n"
2610
2614
"current nickname, execute with no argument."
2613
#: bzrlib/builtins.py:3891
2617
#: bzrlib/builtins.py:3910
2615
2619
"Bound branches use the nickname of its master branch unless it is set\n"
2619
#: bzrlib/builtins.py:3911
2623
#: bzrlib/builtins.py:3930
2620
2624
msgid "Set/unset and display aliases."
2623
#: bzrlib/builtins.py:3913
2627
#: bzrlib/builtins.py:3932
2626
2630
" Show the current aliases::"
2629
#: bzrlib/builtins.py:3916
2633
#: bzrlib/builtins.py:3935
2630
2634
msgid " bzr alias"
2633
#: bzrlib/builtins.py:3918
2637
#: bzrlib/builtins.py:3937
2634
2638
msgid " Show the alias specified for 'll'::"
2637
#: bzrlib/builtins.py:3920
2641
#: bzrlib/builtins.py:3939
2638
2642
msgid " bzr alias ll"
2641
#: bzrlib/builtins.py:3922
2645
#: bzrlib/builtins.py:3941
2642
2646
msgid " Set an alias for 'll'::"
2645
#: bzrlib/builtins.py:3924
2649
#: bzrlib/builtins.py:3943
2646
2650
msgid " bzr alias ll=\"log --line -r-10..-1\""
2649
#: bzrlib/builtins.py:3926
2653
#: bzrlib/builtins.py:3945
2650
2654
msgid " To remove an alias for 'll'::"
2653
#: bzrlib/builtins.py:3928
2657
#: bzrlib/builtins.py:3947
2654
2658
msgid " bzr alias --remove ll"
2657
#: bzrlib/builtins.py:3933
2661
#: bzrlib/builtins.py:3952
2658
2662
msgid "Remove the alias."
2661
#: bzrlib/builtins.py:3951
2665
#: bzrlib/builtins.py:3970
2662
2666
msgid "bzr alias --remove expects an alias to remove."
2665
#: bzrlib/builtins.py:4132
2669
#: bzrlib/builtins.py:4151
2667
2671
"subunit not available. subunit needs to be installed to use --subunit."
2670
#: bzrlib/builtins.py:4149
2674
#: bzrlib/builtins.py:4168
2672
2676
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2675
#: bzrlib/builtins.py:4196
2679
#: bzrlib/builtins.py:4215
2676
2680
msgid "Show version of bzr."
2679
#: bzrlib/builtins.py:4200
2683
#: bzrlib/builtins.py:4219
2680
2684
msgid "Print just the version number."
2683
#: bzrlib/builtins.py:4219
2687
#: bzrlib/builtins.py:4238
2684
2688
msgid "It sure does!\n"
2687
#: bzrlib/builtins.py:4243
2691
#: bzrlib/builtins.py:4262
2688
2692
#, python-format
2689
2693
msgid "merge base is revision %s\n"
2692
#: bzrlib/builtins.py:4247
2696
#: bzrlib/builtins.py:4266
2693
2697
msgid "Perform a three-way merge."
2696
#: bzrlib/builtins.py:4249
2700
#: bzrlib/builtins.py:4268
2698
2702
"The source of the merge can be specified either in the form of a branch,\n"
2699
2703
"or in the form of a path to a file containing a merge directive generated\n"
2773
2777
"merge revision which has more than two parents."
2776
#: bzrlib/builtins.py:4296
2780
#: bzrlib/builtins.py:4315
2778
2782
"If one would like to merge changes from the working tree of the other\n"
2779
2783
"branch without merging any committed revisions, the --uncommitted option\n"
2780
2784
"can be given."
2783
#: bzrlib/builtins.py:4300
2787
#: bzrlib/builtins.py:4319
2785
2789
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2786
2790
"you to apply each diff hunk and file change, similar to \"shelve\"."
2789
#: bzrlib/builtins.py:4303
2793
#: bzrlib/builtins.py:4322
2792
2796
" To merge all new revisions from bzr.dev::"
2795
#: bzrlib/builtins.py:4306
2799
#: bzrlib/builtins.py:4325
2796
2800
msgid " bzr merge ../bzr.dev"
2799
#: bzrlib/builtins.py:4308
2803
#: bzrlib/builtins.py:4327
2800
2804
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2803
#: bzrlib/builtins.py:4310
2807
#: bzrlib/builtins.py:4329
2804
2808
msgid " bzr merge -r 82 ../bzr.dev"
2807
#: bzrlib/builtins.py:4312
2811
#: bzrlib/builtins.py:4331
2808
2812
msgid " To merge the changes introduced by 82, without previous changes::"
2811
#: bzrlib/builtins.py:4314
2815
#: bzrlib/builtins.py:4333
2812
2816
msgid " bzr merge -r 81..82 ../bzr.dev"
2815
#: bzrlib/builtins.py:4316
2819
#: bzrlib/builtins.py:4335
2816
2820
msgid " To apply a merge directive contained in /tmp/merge::"
2819
#: bzrlib/builtins.py:4318
2823
#: bzrlib/builtins.py:4337
2820
2824
msgid " bzr merge /tmp/merge"
2823
#: bzrlib/builtins.py:4320
2827
#: bzrlib/builtins.py:4339
2825
2829
" To create a merge revision with three parents from two branches\n"
2826
2830
" feature1a and feature1b:"
2829
#: bzrlib/builtins.py:4323
2833
#: bzrlib/builtins.py:4342
2831
2835
" bzr merge ../feature1a\n"
2832
2836
" bzr merge ../feature1b --force\n"
2833
2837
" bzr commit -m 'revision with three parents'"
2836
#: bzrlib/builtins.py:4335
2840
#: bzrlib/builtins.py:4354
2837
2841
msgid "Merge even if the destination tree has uncommitted changes."
2840
#: bzrlib/builtins.py:4341
2844
#: bzrlib/builtins.py:4360
2842
2846
"Apply uncommitted changes from a working copy, instead of branch changes."
2845
#: bzrlib/builtins.py:4343
2849
#: bzrlib/builtins.py:4362
2847
2851
"If the destination is already completely merged into the source, pull from "
2848
2852
"the source rather than merging. When this happens, you do not need to "
2849
2853
"commit the result."
2852
#: bzrlib/builtins.py:4348
2856
#: bzrlib/builtins.py:4367
2854
2858
"Branch to merge into, rather than the one containing the working directory."
2857
#: bzrlib/builtins.py:4350
2861
#: bzrlib/builtins.py:4369
2858
2862
msgid "Instead of merging, show a diff of the merge."
2861
#: bzrlib/builtins.py:4352
2865
#: bzrlib/builtins.py:4371
2862
2866
msgid "Select changes interactively."
2865
#: bzrlib/builtins.py:4374
2869
#: bzrlib/builtins.py:4393
2867
2871
"Merging into empty branches not currently supported, "
2868
2872
"https://bugs.launchpad.net/bzr/+bug/308562"
2871
#: bzrlib/builtins.py:4401
2875
#: bzrlib/builtins.py:4420
2872
2876
msgid "Cannot use --uncommitted with bundles or merge directives."
2875
#: bzrlib/builtins.py:4412
2879
#: bzrlib/builtins.py:4431
2876
2880
msgid "Cannot use --uncommitted and --revision at the same time."
2879
#: bzrlib/builtins.py:4432
2883
#: bzrlib/builtins.py:4451
2880
2884
msgid "merger: "
2883
#: bzrlib/builtins.py:4434 bzrlib/bundle/apply_bundle.py:71
2887
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2884
2888
msgid "Nothing to do."
2887
#: bzrlib/builtins.py:4438
2891
#: bzrlib/builtins.py:4457
2888
2892
msgid "Cannot pull individual files"
2891
#: bzrlib/builtins.py:4446
2895
#: bzrlib/builtins.py:4465
2892
2896
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2895
#: bzrlib/builtins.py:4504
2899
#: bzrlib/builtins.py:4523
2896
2900
#, python-format
2897
2901
msgid "Show-base is not supported for this merge type. %s"
2900
#: bzrlib/builtins.py:4513
2904
#: bzrlib/builtins.py:4532
2901
2905
#, python-format
2902
2906
msgid "Conflict reduction is not supported for merge type %s."
2905
#: bzrlib/builtins.py:4517
2909
#: bzrlib/builtins.py:4536
2906
2910
msgid "Cannot do conflict reduction and show base."
2909
#: bzrlib/builtins.py:4628
2913
#: bzrlib/builtins.py:4647
2910
2914
msgid "No location specified or remembered"
2913
#: bzrlib/builtins.py:4630
2917
#: bzrlib/builtins.py:4649
2914
2918
msgid "{0} remembered {1} location {2}"
2917
#: bzrlib/builtins.py:4636
2921
#: bzrlib/builtins.py:4655
2918
2922
msgid "Redo a merge."
2921
#: bzrlib/builtins.py:4638
2925
#: bzrlib/builtins.py:4657
2923
2927
"Use this if you want to try a different merge technique while resolving\n"
2924
2928
"conflicts. Some merge techniques are better than others, and remerge\n"
2925
2929
"lets you try different ones on different files."
2928
#: bzrlib/builtins.py:4642
2932
#: bzrlib/builtins.py:4661
2930
2934
"The options for remerge have the same meaning and defaults as the ones for\n"
2931
2935
"merge. The difference is that remerge can (only) be run when there is a\n"
2932
2936
"pending merge, and it lets you specify particular files."
2935
#: bzrlib/builtins.py:4646
2939
#: bzrlib/builtins.py:4665
2938
2942
" Re-do the merge of all conflicted files, and show the base text in\n"
2939
2943
" conflict regions, in addition to the usual THIS and OTHER texts::"
2942
#: bzrlib/builtins.py:4650
2946
#: bzrlib/builtins.py:4669
2943
2947
msgid " bzr remerge --show-base"
2946
#: bzrlib/builtins.py:4652
2950
#: bzrlib/builtins.py:4671
2948
2952
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2949
2953
" additional processing to reduce the size of conflict regions::"
2952
#: bzrlib/builtins.py:4655
2956
#: bzrlib/builtins.py:4674
2953
2957
msgid " bzr remerge --merge-type weave --reprocess foobar"
2956
#: bzrlib/builtins.py:4662
2960
#: bzrlib/builtins.py:4681
2957
2961
msgid "Show base revision text in conflicts."
2960
#: bzrlib/builtins.py:4674
2964
#: bzrlib/builtins.py:4693
2962
2966
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2966
#: bzrlib/builtins.py:4731
2967
msgid "Revert files to a previous revision."
2970
#: bzrlib/builtins.py:4751
2972
"Set files in the working tree back to the contents of a previous revision."
2970
#: bzrlib/builtins.py:4733
2975
#: bzrlib/builtins.py:4753
2972
2977
"Giving a list of files will revert only those files. Otherwise, all files\n"
2973
2978
"will be reverted. If the revision is not specified with '--revision', the\n"
2974
"last committed revision is used."
2979
"working tree basis revision is used. A revert operation affects only the\n"
2980
"working tree, not any revision history like the branch and repository or\n"
2981
"the working tree basis revision."
2977
#: bzrlib/builtins.py:4737
2984
#: bzrlib/builtins.py:4759
2979
2986
"To remove only some changes, without reverting to a prior version, use\n"
2980
2987
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2981
2988
"will remove the changes introduced by the second last commit (-2), without\n"
2982
2989
"affecting the changes introduced by the last commit (-1). To remove\n"
2983
"certain changes on a hunk-by-hunk basis, see the shelve command."
2990
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2991
"To update the branch to a specific revision or the latest revision and\n"
2992
"update the working tree accordingly while preserving local changes, see the\n"
2986
#: bzrlib/builtins.py:4743
2996
#: bzrlib/builtins.py:4768
2988
"By default, any files that have been manually changed will be backed up\n"
2989
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2990
"'.~#~' appended to their name, where # is a number."
2998
"Uncommitted changes to files that are reverted will be discarded.\n"
2999
"Howver, by default, any files that have been manually changed will be\n"
3000
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3001
"files have '.~#~' appended to their name, where # is a number."
2993
#: bzrlib/builtins.py:4747
3004
#: bzrlib/builtins.py:4773
2995
3006
"When you provide files, you can use their current pathname or the pathname\n"
2996
3007
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3069
3080
" 0 - no missing revisions"
3072
#: bzrlib/builtins.py:4861
3083
#: bzrlib/builtins.py:4887
3074
3085
" Determine the missing revisions between this and the branch at the\n"
3075
3086
" remembered pull location::"
3078
#: bzrlib/builtins.py:4864
3089
#: bzrlib/builtins.py:4890
3079
3090
msgid " bzr missing"
3082
#: bzrlib/builtins.py:4866
3093
#: bzrlib/builtins.py:4892
3083
3094
msgid " Determine the missing revisions between this and another branch::"
3086
#: bzrlib/builtins.py:4868
3097
#: bzrlib/builtins.py:4894
3087
3098
msgid " bzr missing http://server/branch"
3090
#: bzrlib/builtins.py:4870
3101
#: bzrlib/builtins.py:4896
3092
3103
" Determine the missing revisions up to a specific revision on the other\n"
3096
#: bzrlib/builtins.py:4873
3107
#: bzrlib/builtins.py:4899
3097
3108
msgid " bzr missing -r ..-10"
3100
#: bzrlib/builtins.py:4875
3111
#: bzrlib/builtins.py:4901
3102
3113
" Determine the missing revisions up to a specific revision on this\n"
3106
#: bzrlib/builtins.py:4878
3117
#: bzrlib/builtins.py:4904
3107
3118
msgid " bzr missing --my-revision ..-10"
3110
#: bzrlib/builtins.py:4885
3121
#: bzrlib/builtins.py:4911
3111
3122
msgid "Reverse the order of revisions."
3114
#: bzrlib/builtins.py:4887
3125
#: bzrlib/builtins.py:4913
3115
3126
msgid "Display changes in the local branch only."
3118
#: bzrlib/builtins.py:4888
3129
#: bzrlib/builtins.py:4914
3119
3130
msgid "Same as --mine-only."
3122
#: bzrlib/builtins.py:4890
3133
#: bzrlib/builtins.py:4916
3123
3134
msgid "Display changes in the remote branch only."
3126
#: bzrlib/builtins.py:4891
3137
#: bzrlib/builtins.py:4917
3127
3138
msgid "Same as --theirs-only."
3130
#: bzrlib/builtins.py:4896
3141
#: bzrlib/builtins.py:4922
3132
3143
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3136
#: bzrlib/builtins.py:4900
3147
#: bzrlib/builtins.py:4926
3138
3149
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3142
#: bzrlib/builtins.py:4903
3153
#: bzrlib/builtins.py:4929
3143
3154
msgid "Show all revisions in addition to the mainline ones."
3146
#: bzrlib/builtins.py:4957
3157
#: bzrlib/builtins.py:4983
3147
3158
msgid "No peer location known or specified."
3150
#: bzrlib/builtins.py:4961
3161
#: bzrlib/builtins.py:4987
3151
3162
msgid "Using saved parent location: {0}\n"
3154
#: bzrlib/builtins.py:4994
3165
#: bzrlib/builtins.py:5020
3155
3166
#, python-format
3156
3167
msgid "You have %d extra revision:\n"
3157
3168
msgid_plural "You have %d extra revisions:\n"
3161
#: bzrlib/builtins.py:5010
3172
#: bzrlib/builtins.py:5040
3162
3173
#, python-format
3163
3174
msgid "You are missing %d revision:\n"
3164
3175
msgid_plural "You are missing %d revisions:\n"
3168
#: bzrlib/builtins.py:5022
3179
#: bzrlib/builtins.py:5055
3169
3180
msgid "This branch has no new revisions.\n"
3172
#: bzrlib/builtins.py:5025
3183
#: bzrlib/builtins.py:5058
3173
3184
msgid "Other branch has no new revisions.\n"
3176
#: bzrlib/builtins.py:5030
3187
#: bzrlib/builtins.py:5063
3177
3188
msgid "Branches are up to date.\n"
3180
#: bzrlib/builtins.py:5041
3191
#: bzrlib/builtins.py:5074
3181
3192
msgid "Compress the data within a repository."
3184
#: bzrlib/builtins.py:5043
3195
#: bzrlib/builtins.py:5076
3186
3197
"This operation compresses the data within a bazaar repository. As\n"
3187
3198
"bazaar supports automatic packing of repository, this operation is\n"
3188
3199
"normally not required to be done manually."
3191
#: bzrlib/builtins.py:5047
3202
#: bzrlib/builtins.py:5080
3193
3204
"During the pack operation, bazaar takes a backup of existing repository\n"
3194
3205
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3240
3251
"plugins using the Python programming language."
3243
#: bzrlib/builtins.py:5105
3254
#: bzrlib/builtins.py:5138
3244
3255
msgid "Show testament (signing-form) of a revision."
3247
#: bzrlib/builtins.py:5108
3258
#: bzrlib/builtins.py:5141
3248
3259
msgid "Produce long-format testament."
3251
#: bzrlib/builtins.py:5110
3262
#: bzrlib/builtins.py:5143
3252
3263
msgid "Produce a strict-format testament."
3255
#: bzrlib/builtins.py:5136
3266
#: bzrlib/builtins.py:5169
3256
3267
msgid "Show the origin of each line in a file."
3259
#: bzrlib/builtins.py:5138
3270
#: bzrlib/builtins.py:5171
3261
3272
"This prints out the given file with an annotation on the left side\n"
3262
3273
"indicating which revision, author and date introduced the change."
3265
#: bzrlib/builtins.py:5141
3276
#: bzrlib/builtins.py:5174
3267
3278
"If the origin is the same for a run of consecutive lines, it is\n"
3268
3279
"shown only at the top, unless the --all option is given."
3271
#: bzrlib/builtins.py:5149
3282
#: bzrlib/builtins.py:5182
3272
3283
msgid "Show annotations on all lines."
3275
#: bzrlib/builtins.py:5150
3286
#: bzrlib/builtins.py:5183
3276
3287
msgid "Show commit date in annotations."
3279
#: bzrlib/builtins.py:5237
3290
#: bzrlib/builtins.py:5270
3280
3291
msgid "Cannot sign a range of non-revision-history revisions"
3283
#: bzrlib/builtins.py:5249
3294
#: bzrlib/builtins.py:5282
3284
3295
msgid "Please supply either one revision, or a range."
3287
#: bzrlib/builtins.py:5253
3298
#: bzrlib/builtins.py:5286
3289
3300
"Convert the current branch into a checkout of the supplied branch.\n"
3290
3301
"If no branch is supplied, rebind to the last bound location."
3293
#: bzrlib/builtins.py:5256
3304
#: bzrlib/builtins.py:5289
3295
3306
"Once converted into a checkout, commits must succeed on the master branch\n"
3296
3307
"before they will be applied to the local branch."
3299
#: bzrlib/builtins.py:5259
3310
#: bzrlib/builtins.py:5292
3301
3312
"Bound branches use the nickname of its master branch unless it is set\n"
3302
3313
"locally, in which case binding will update the local nickname to be\n"
3303
3314
"that of the master."
3306
#: bzrlib/builtins.py:5274
3317
#: bzrlib/builtins.py:5307
3307
3318
msgid "No location supplied. This format does not remember old locations."
3310
#: bzrlib/builtins.py:5280
3321
#: bzrlib/builtins.py:5313
3311
3322
msgid "Branch is already bound"
3314
#: bzrlib/builtins.py:5283
3325
#: bzrlib/builtins.py:5316
3315
3326
msgid "No location supplied and no previous location known"
3318
#: bzrlib/builtins.py:5289
3329
#: bzrlib/builtins.py:5322
3319
3330
msgid "These branches have diverged. Try merging, and then bind again."
3322
#: bzrlib/builtins.py:5296
3333
#: bzrlib/builtins.py:5329
3323
3334
msgid "Convert the current checkout into a regular branch."
3326
#: bzrlib/builtins.py:5298
3337
#: bzrlib/builtins.py:5331
3328
3339
"After unbinding, the local branch is considered independent and subsequent\n"
3329
3340
"commits will be local only."
3332
#: bzrlib/builtins.py:5309
3343
#: bzrlib/builtins.py:5342
3333
3344
msgid "Local branch is not bound"
3336
#: bzrlib/builtins.py:5313
3347
#: bzrlib/builtins.py:5346
3337
3348
msgid "Remove the last committed revision."
3340
#: bzrlib/builtins.py:5315
3351
#: bzrlib/builtins.py:5348
3342
3353
"--verbose will print out what is being removed.\n"
3343
3354
"--dry-run will go through all the motions, but not actually\n"
3344
3355
"remove anything."
3347
#: bzrlib/builtins.py:5319
3358
#: bzrlib/builtins.py:5352
3349
3360
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3350
3361
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3351
3362
"branch at revision 15."
3354
#: bzrlib/builtins.py:5323
3365
#: bzrlib/builtins.py:5356
3356
3367
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3357
3368
"it may make is to restore any pending merges that were present before\n"
3361
#: bzrlib/builtins.py:5334
3372
#: bzrlib/builtins.py:5367
3362
3373
msgid "Don't actually make changes."
3365
#: bzrlib/builtins.py:5335
3376
#: bzrlib/builtins.py:5368
3366
3377
msgid "Say yes to all questions."
3369
#: bzrlib/builtins.py:5337
3380
#: bzrlib/builtins.py:5370
3370
3381
msgid "Keep tags that point to removed revisions."
3373
#: bzrlib/builtins.py:5339
3384
#: bzrlib/builtins.py:5372
3374
3385
msgid "Only remove the commits from the local branch when in a checkout."
3377
#: bzrlib/builtins.py:5388
3388
#: bzrlib/builtins.py:5421
3378
3389
msgid "No revisions to uncommit.\n"
3381
#: bzrlib/builtins.py:5403
3392
#: bzrlib/builtins.py:5436
3382
3393
msgid "Dry-run, pretending to remove the above revisions.\n"
3385
#: bzrlib/builtins.py:5406
3396
#: bzrlib/builtins.py:5439
3386
3397
msgid "The above revision(s) will be removed.\n"
3389
#: bzrlib/builtins.py:5410
3400
#: bzrlib/builtins.py:5443
3390
3401
msgid "Uncommit these revisions"
3393
#: bzrlib/builtins.py:5413
3404
#: bzrlib/builtins.py:5446
3394
3405
msgid "Canceled\n"
3397
#: bzrlib/builtins.py:5420
3408
#: bzrlib/builtins.py:5453
3398
3409
#, python-format
3400
3411
"You can restore the old tip by running:\n"
3401
3412
" bzr pull . -r revid:%s\n"
3404
#: bzrlib/builtins.py:5425
3415
#: bzrlib/builtins.py:5458
3405
3416
msgid "Break a dead lock."
3408
#: bzrlib/builtins.py:5427
3419
#: bzrlib/builtins.py:5460
3410
3421
"This command breaks a lock on a repository, branch, working directory or\n"
3414
#: bzrlib/builtins.py:5430
3425
#: bzrlib/builtins.py:5463
3416
3427
"CAUTION: Locks should only be broken when you are sure that the process\n"
3417
3428
"holding the lock has been stopped."
3420
#: bzrlib/builtins.py:5433
3431
#: bzrlib/builtins.py:5466
3422
3433
"You can get information on what locks are open via the 'bzr info\n"
3423
3434
"[location]' command."
3426
#: bzrlib/builtins.py:5436
3437
#: bzrlib/builtins.py:5469
3429
3440
" bzr break-lock\n"
3431
3442
" bzr break-lock --conf ~/.bazaar"
3434
#: bzrlib/builtins.py:5445
3445
#: bzrlib/builtins.py:5478
3435
3446
msgid "LOCATION is the directory where the config lock is."
3438
#: bzrlib/builtins.py:5447
3449
#: bzrlib/builtins.py:5480
3439
3450
msgid "Do not ask for confirmation before breaking the lock."
3442
#: bzrlib/builtins.py:5482
3453
#: bzrlib/builtins.py:5515
3443
3454
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3446
#: bzrlib/builtins.py:5483
3457
#: bzrlib/builtins.py:5516
3447
3458
msgid "Run the bzr server."
3450
#: bzrlib/builtins.py:5489
3461
#: bzrlib/builtins.py:5522
3451
3462
msgid "Serve on stdin/out for use from inetd or sshd."
3454
#: bzrlib/builtins.py:5490
3465
#: bzrlib/builtins.py:5523
3455
3466
msgid "protocol"
3458
#: bzrlib/builtins.py:5491
3469
#: bzrlib/builtins.py:5524
3459
3470
msgid "Protocol to serve."
3462
#: bzrlib/builtins.py:5495
3473
#: bzrlib/builtins.py:5528
3463
3474
msgid "Listen for connections on nominated address."
3466
#: bzrlib/builtins.py:5497
3477
#: bzrlib/builtins.py:5530
3468
3479
"Listen for connections on nominated port. Passing 0 as the port number will "
3469
3480
"result in a dynamically allocated port. The default port depends on the "
3473
#: bzrlib/builtins.py:5502
3484
#: bzrlib/builtins.py:5535
3474
3485
msgid "Serve contents of this directory."
3477
#: bzrlib/builtins.py:5504
3488
#: bzrlib/builtins.py:5537
3479
3490
"By default the server is a readonly server. Supplying --allow-writes "
3480
3491
"enables write access to the contents of the served directory and below. "
3483
3494
"uncontrolled write access to your file system."
3486
#: bzrlib/builtins.py:5513
3497
#: bzrlib/builtins.py:5546
3487
3498
msgid "Override the default idle client timeout (5min)."
3490
#: bzrlib/builtins.py:5531
3501
#: bzrlib/builtins.py:5564
3491
3502
msgid "Combine a tree into its containing tree."
3494
#: bzrlib/builtins.py:5533
3505
#: bzrlib/builtins.py:5566
3495
3506
msgid "This command requires the target tree to be in a rich-root format."
3498
#: bzrlib/builtins.py:5535
3509
#: bzrlib/builtins.py:5568
3500
3511
"The TREE argument should be an independent tree, inside another tree, but\n"
3501
3512
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3502
3513
"running \"bzr branch\" with the target inside a tree.)"
3505
#: bzrlib/builtins.py:5539
3516
#: bzrlib/builtins.py:5572
3507
3518
"The result is a combined tree, with the subtree no longer an independent\n"
3508
3519
"part. This is marked as a merge of the subtree into the containing tree,\n"
3509
3520
"and all history is preserved."
3512
#: bzrlib/builtins.py:5557
3523
#: bzrlib/builtins.py:5590
3513
3524
#, python-format
3515
3526
"Can't join trees because %s doesn't support rich root data.\n"
3516
3527
"You can use bzr upgrade on the repository."
3519
#: bzrlib/builtins.py:5567 bzrlib/builtins.py:5573
3530
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3520
3531
msgid "Cannot join {0}. {1}"
3523
#: bzrlib/builtins.py:5577
3534
#: bzrlib/builtins.py:5610
3524
3535
msgid "Split a subdirectory of a tree into a separate tree."
3527
#: bzrlib/builtins.py:5579
3538
#: bzrlib/builtins.py:5612
3529
3540
"This command will produce a target tree in a format that supports\n"
3530
3541
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3531
3542
"converted into earlier formats like 'dirstate-tags'."
3534
#: bzrlib/builtins.py:5583
3545
#: bzrlib/builtins.py:5616
3536
3547
"The TREE argument should be a subdirectory of a working tree. That\n"
3537
3548
"subdirectory will be converted into an independent tree, with its own\n"
3538
3549
"branch. Commits in the top-level tree will not apply to the new subtree."
3541
#: bzrlib/builtins.py:5663
3552
#: bzrlib/builtins.py:5696
3542
3553
msgid "No submit branch specified or known"
3545
#: bzrlib/builtins.py:5672 bzrlib/send.py:109
3556
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3546
3557
msgid "No public branch specified or known"
3549
#: bzrlib/builtins.py:5677
3560
#: bzrlib/builtins.py:5710
3550
3561
msgid "bzr merge-directive takes at most two one revision identifiers"
3553
#: bzrlib/builtins.py:5686
3564
#: bzrlib/builtins.py:5719
3554
3565
msgid "No revisions to bundle."
3557
#: bzrlib/builtins.py:5705
3568
#: bzrlib/builtins.py:5738
3558
3569
msgid "Mail or create a merge-directive for submitting changes."
3561
#: bzrlib/builtins.py:5707
3572
#: bzrlib/builtins.py:5740
3562
3573
msgid "A merge directive provides many things needed for requesting merges:"
3565
#: bzrlib/builtins.py:5709
3576
#: bzrlib/builtins.py:5742
3566
3577
msgid "* A machine-readable description of the merge to perform"
3569
#: bzrlib/builtins.py:5711
3580
#: bzrlib/builtins.py:5744
3570
3581
msgid "* An optional patch that is a preview of the changes requested"
3573
#: bzrlib/builtins.py:5713
3584
#: bzrlib/builtins.py:5746
3575
3586
"* An optional bundle of revision data, so that the changes can be applied\n"
3576
3587
" directly from the merge directive, without retrieving data from a\n"
3580
#: bzrlib/builtins.py:5717
3591
#: bzrlib/builtins.py:5750
3582
3593
"`bzr send` creates a compact data set that, when applied using bzr\n"
3583
3594
"merge, has the same effect as merging from the source branch. "
3586
#: bzrlib/builtins.py:5720
3597
#: bzrlib/builtins.py:5753
3588
3599
"By default the merge directive is self-contained and can be applied to any\n"
3589
3600
"branch containing submit_branch in its ancestory without needing access to\n"
3590
3601
"the source branch."
3593
#: bzrlib/builtins.py:5724
3604
#: bzrlib/builtins.py:5757
3595
3606
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3596
3607
"revisions, but only a structured request to merge from the\n"
3682
3693
"set them, and use `bzr info` to display them."
3685
#: bzrlib/builtins.py:5799
3696
#: bzrlib/builtins.py:5832
3686
3697
msgid "Write merge directive to this file or directory; use - for stdout."
3689
#: bzrlib/builtins.py:5803
3700
#: bzrlib/builtins.py:5836
3691
3702
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3692
3703
"strict disables the check."
3695
#: bzrlib/builtins.py:5805
3706
#: bzrlib/builtins.py:5838
3696
3707
msgid "Mail the request to this address."
3699
#: bzrlib/builtins.py:5809
3710
#: bzrlib/builtins.py:5842
3700
3711
msgid "Body for the email."
3703
#: bzrlib/builtins.py:5862
3714
#: bzrlib/builtins.py:5895
3704
3715
msgid "Do not include a bundle in the merge directive."
3707
#: bzrlib/builtins.py:5863
3718
#: bzrlib/builtins.py:5896
3708
3719
msgid "Do not include a preview patch in the merge directive."
3711
#: bzrlib/builtins.py:5866
3722
#: bzrlib/builtins.py:5899
3712
3723
msgid "Remember submit and public branch."
3715
#: bzrlib/builtins.py:5868
3726
#: bzrlib/builtins.py:5901
3717
3728
"Branch to generate the submission from, rather than the one containing the "
3718
3729
"working directory."
3721
#: bzrlib/builtins.py:5878 bzrlib/cmd_version_info.py:76
3732
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3725
#: bzrlib/builtins.py:5879
3736
#: bzrlib/builtins.py:5912
3726
3737
msgid "Use the specified output format."
3729
#: bzrlib/builtins.py:5901
3740
#: bzrlib/builtins.py:5934
3730
3741
msgid "Create, remove or modify a tag naming a revision."
3733
#: bzrlib/builtins.py:5903
3744
#: bzrlib/builtins.py:5936
3735
3746
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3736
3747
"(--revision) option can be given -rtag:X, where X is any previously\n"
3740
#: bzrlib/builtins.py:5907
3751
#: bzrlib/builtins.py:5940
3742
3753
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3743
3754
"along when you branch, push, pull or merge."
3746
#: bzrlib/builtins.py:5910
3757
#: bzrlib/builtins.py:5943
3748
3759
"It is an error to give a tag name that already exists unless you pass\n"
3749
3760
"--force, in which case the tag is moved to point to the new revision."
3752
#: bzrlib/builtins.py:5913
3763
#: bzrlib/builtins.py:5946
3754
3765
"To rename a tag (change the name but keep it on the same revsion), run "
3756
3767
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3759
#: bzrlib/builtins.py:5916
3770
#: bzrlib/builtins.py:5949
3761
3772
"If no tag name is specified it will be determined through the \n"
3762
3773
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3767
#: bzrlib/builtins.py:5926
3778
#: bzrlib/builtins.py:5959
3768
3779
msgid "Delete this tag rather than placing it."
3771
#: bzrlib/builtins.py:5929
3782
#: bzrlib/builtins.py:5962
3772
3783
msgid "Branch in which to place the tag."
3775
#: bzrlib/builtins.py:5931
3786
#: bzrlib/builtins.py:5964
3776
3787
msgid "Replace existing tags."
3779
#: bzrlib/builtins.py:5946
3790
#: bzrlib/builtins.py:5979
3780
3791
msgid "No tag specified to delete."
3783
#: bzrlib/builtins.py:5948
3794
#: bzrlib/builtins.py:5981
3784
3795
#, python-format
3785
3796
msgid "Deleted tag %s."
3788
#: bzrlib/builtins.py:5962
3799
#: bzrlib/builtins.py:5995
3789
3800
msgid "Please specify a tag name."
3792
#: bzrlib/builtins.py:5970
3803
#: bzrlib/builtins.py:6003
3793
3804
#, python-format
3794
3805
msgid "Tag %s already exists for that revision."
3797
#: bzrlib/builtins.py:5974
3808
#: bzrlib/builtins.py:6007
3798
3809
#, python-format
3799
3810
msgid "Created tag %s."
3802
#: bzrlib/builtins.py:5976
3813
#: bzrlib/builtins.py:6009
3803
3814
#, python-format
3804
3815
msgid "Updated tag %s."
3807
#: bzrlib/builtins.py:5980
3818
#: bzrlib/builtins.py:6013
3808
3819
msgid "List tags."
3811
#: bzrlib/builtins.py:5982
3822
#: bzrlib/builtins.py:6015
3813
3824
"This command shows a table of tag names and the revisions they reference."
3816
#: bzrlib/builtins.py:5988
3827
#: bzrlib/builtins.py:6021
3817
3828
msgid "Branch whose tags should be displayed."
3820
#: bzrlib/builtins.py:5990
3831
#: bzrlib/builtins.py:6023
3821
3832
msgid "Sort tags by different criteria."
3824
#: bzrlib/builtins.py:5990
3835
#: bzrlib/builtins.py:6023
3825
3836
msgid "Sorting"
3828
#: bzrlib/builtins.py:6059
3839
#: bzrlib/builtins.py:6092
3829
3840
msgid "Reconfigure the type of a bzr directory."
3832
#: bzrlib/builtins.py:6061
3843
#: bzrlib/builtins.py:6094
3833
3844
msgid "A target configuration must be specified."
3836
#: bzrlib/builtins.py:6063
3847
#: bzrlib/builtins.py:6096
3838
3849
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3839
3850
"The order of preference is\n"
3844
3855
"If none of these is available, --bind-to must be specified."
3847
#: bzrlib/builtins.py:6077
3858
#: bzrlib/builtins.py:6110
3848
3859
msgid "Tree type"
3851
#: bzrlib/builtins.py:6078
3862
#: bzrlib/builtins.py:6111
3852
3863
msgid "The relation between branch and tree."
3855
#: bzrlib/builtins.py:6080
3866
#: bzrlib/builtins.py:6113
3856
3867
msgid "Reconfigure to be an unbound branch with no working tree."
3859
#: bzrlib/builtins.py:6081
3870
#: bzrlib/builtins.py:6114
3860
3871
msgid "Reconfigure to be an unbound branch with a working tree."
3863
#: bzrlib/builtins.py:6082
3874
#: bzrlib/builtins.py:6115
3864
3875
msgid "Reconfigure to be a bound branch with a working tree."
3867
#: bzrlib/builtins.py:6083
3878
#: bzrlib/builtins.py:6116
3868
3879
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3871
#: bzrlib/builtins.py:6088
3882
#: bzrlib/builtins.py:6121
3872
3883
msgid "Repository type"
3875
#: bzrlib/builtins.py:6089
3886
#: bzrlib/builtins.py:6122
3876
3887
msgid "Location fo the repository."
3879
#: bzrlib/builtins.py:6091
3890
#: bzrlib/builtins.py:6124
3881
3892
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3884
#: bzrlib/builtins.py:6093
3895
#: bzrlib/builtins.py:6126
3885
3896
msgid "Reconfigure to use a shared repository."
3888
#: bzrlib/builtins.py:6097
3899
#: bzrlib/builtins.py:6130
3889
3900
msgid "Trees in Repository"
3892
#: bzrlib/builtins.py:6098
3903
#: bzrlib/builtins.py:6131
3893
3904
msgid "Whether new branches in the repository have trees."
3896
#: bzrlib/builtins.py:6100
3907
#: bzrlib/builtins.py:6133
3898
3909
"Reconfigure repository to create working trees on branches by default."
3901
#: bzrlib/builtins.py:6102
3912
#: bzrlib/builtins.py:6135
3903
3914
"Reconfigure repository to not create working trees on branches by default."
3906
#: bzrlib/builtins.py:6105
3917
#: bzrlib/builtins.py:6138
3907
3918
msgid "Branch to bind checkout to."
3910
#: bzrlib/builtins.py:6107
3921
#: bzrlib/builtins.py:6140
3911
3922
msgid "Perform reconfiguration even if local changes will be lost."
3914
#: bzrlib/builtins.py:6110
3925
#: bzrlib/builtins.py:6143
3915
3926
msgid "Reconfigure a branch to be stacked on another branch."
3918
#: bzrlib/builtins.py:6114
3929
#: bzrlib/builtins.py:6147
3920
3931
"Reconfigure a branch to be unstacked. This may require copying substantial "
3921
3932
"data into it."
3924
#: bzrlib/builtins.py:6124
3935
#: bzrlib/builtins.py:6157
3925
3936
msgid "Can't use both --stacked-on and --unstacked"
3928
#: bzrlib/builtins.py:6138
3939
#: bzrlib/builtins.py:6171
3929
3940
msgid "No target configuration specified"
3932
#: bzrlib/builtins.py:6173
3943
#: bzrlib/builtins.py:6206
3933
3944
msgid "Set the branch of a checkout and update."
3936
#: bzrlib/builtins.py:6175
3947
#: bzrlib/builtins.py:6208
3938
3949
"For lightweight checkouts, this changes the branch being referenced.\n"
3939
3950
"For heavyweight checkouts, this checks that there are no local commits\n"
4012
4023
"want to switch back to your view after that."
4015
#: bzrlib/builtins.py:6272
4026
#: bzrlib/builtins.py:6305
4018
4029
" To define the current view::"
4021
#: bzrlib/builtins.py:6275
4032
#: bzrlib/builtins.py:6308
4022
4033
msgid " bzr view file1 dir1 ..."
4025
#: bzrlib/builtins.py:6277
4036
#: bzrlib/builtins.py:6310
4026
4037
msgid " To list the current view::"
4029
#: bzrlib/builtins.py:6279
4040
#: bzrlib/builtins.py:6312
4030
4041
msgid " bzr view"
4033
#: bzrlib/builtins.py:6281
4044
#: bzrlib/builtins.py:6314
4034
4045
msgid " To delete the current view::"
4037
#: bzrlib/builtins.py:6283
4048
#: bzrlib/builtins.py:6316
4038
4049
msgid " bzr view --delete"
4041
#: bzrlib/builtins.py:6285
4052
#: bzrlib/builtins.py:6318
4042
4053
msgid " To disable the current view without deleting it::"
4045
#: bzrlib/builtins.py:6287
4056
#: bzrlib/builtins.py:6320
4046
4057
msgid " bzr view --switch off"
4049
#: bzrlib/builtins.py:6289
4060
#: bzrlib/builtins.py:6322
4050
4061
msgid " To define a named view and switch to it::"
4053
#: bzrlib/builtins.py:6291
4064
#: bzrlib/builtins.py:6324
4054
4065
msgid " bzr view --name view-name file1 dir1 ..."
4057
#: bzrlib/builtins.py:6293
4068
#: bzrlib/builtins.py:6326
4058
4069
msgid " To list a named view::"
4061
#: bzrlib/builtins.py:6295
4072
#: bzrlib/builtins.py:6328
4062
4073
msgid " bzr view --name view-name"
4065
#: bzrlib/builtins.py:6297
4076
#: bzrlib/builtins.py:6330
4066
4077
msgid " To delete a named view::"
4069
#: bzrlib/builtins.py:6299
4080
#: bzrlib/builtins.py:6332
4070
4081
msgid " bzr view --name view-name --delete"
4073
#: bzrlib/builtins.py:6301
4084
#: bzrlib/builtins.py:6334
4074
4085
msgid " To switch to a named view::"
4077
#: bzrlib/builtins.py:6303
4088
#: bzrlib/builtins.py:6336
4078
4089
msgid " bzr view --switch view-name"
4081
#: bzrlib/builtins.py:6305
4092
#: bzrlib/builtins.py:6338
4082
4093
msgid " To list all views defined::"
4085
#: bzrlib/builtins.py:6307
4096
#: bzrlib/builtins.py:6340
4086
4097
msgid " bzr view --all"
4089
#: bzrlib/builtins.py:6309
4100
#: bzrlib/builtins.py:6342
4090
4101
msgid " To delete all views::"
4093
#: bzrlib/builtins.py:6311
4104
#: bzrlib/builtins.py:6344
4094
4105
msgid " bzr view --delete --all"
4097
#: bzrlib/builtins.py:6318
4108
#: bzrlib/builtins.py:6351
4098
4109
msgid "Apply list or delete action to all views."
4101
#: bzrlib/builtins.py:6321
4112
#: bzrlib/builtins.py:6354
4102
4113
msgid "Delete the view."
4105
#: bzrlib/builtins.py:6324
4116
#: bzrlib/builtins.py:6357
4106
4117
msgid "Name of the view to define, list or delete."
4109
#: bzrlib/builtins.py:6328
4120
#: bzrlib/builtins.py:6361
4110
4121
msgid "Name of the view to switch to."
4113
#: bzrlib/builtins.py:6347
4124
#: bzrlib/builtins.py:6380
4114
4125
msgid "Both --delete and a file list specified"
4117
#: bzrlib/builtins.py:6350
4128
#: bzrlib/builtins.py:6383
4118
4129
msgid "Both --delete and --switch specified"
4121
#: bzrlib/builtins.py:6353
4132
#: bzrlib/builtins.py:6386
4122
4133
msgid "Deleted all views.\n"
4125
#: bzrlib/builtins.py:6355
4136
#: bzrlib/builtins.py:6388
4126
4137
msgid "No current view to delete"
4129
#: bzrlib/builtins.py:6358
4140
#: bzrlib/builtins.py:6391
4130
4141
#, python-format
4131
4142
msgid "Deleted '%s' view.\n"
4134
#: bzrlib/builtins.py:6362
4145
#: bzrlib/builtins.py:6395
4135
4146
msgid "Both --switch and a file list specified"
4138
#: bzrlib/builtins.py:6365
4149
#: bzrlib/builtins.py:6398
4139
4150
msgid "Both --switch and --all specified"
4142
#: bzrlib/builtins.py:6368
4153
#: bzrlib/builtins.py:6401
4143
4154
msgid "No current view to disable"
4146
#: bzrlib/builtins.py:6370
4157
#: bzrlib/builtins.py:6403
4147
4158
#, python-format
4148
4159
msgid "Disabled '%s' view.\n"
4151
#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396
4162
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4152
4163
msgid "Using '{0}' view: {1}\n"
4155
#: bzrlib/builtins.py:6377
4166
#: bzrlib/builtins.py:6410
4156
4167
msgid "Views defined:\n"
4159
#: bzrlib/builtins.py:6386
4170
#: bzrlib/builtins.py:6419
4160
4171
msgid "No views defined.\n"
4163
#: bzrlib/builtins.py:6393
4174
#: bzrlib/builtins.py:6426
4164
4175
msgid "Cannot change the 'off' pseudo view"
4167
#: bzrlib/builtins.py:6401
4178
#: bzrlib/builtins.py:6434
4168
4179
msgid "No current view.\n"
4171
#: bzrlib/builtins.py:6404
4182
#: bzrlib/builtins.py:6437
4172
4183
msgid "'{0}' view is: {1}\n"
4175
#: bzrlib/builtins.py:6424
4186
#: bzrlib/builtins.py:6457
4176
4187
msgid " <no hooks installed>\n"
4179
#: bzrlib/builtins.py:6428
4190
#: bzrlib/builtins.py:6461
4180
4191
msgid "Remove a branch."
4183
#: bzrlib/builtins.py:6430
4194
#: bzrlib/builtins.py:6463
4185
4196
"This will remove the branch from the specified location but \n"
4186
4197
"will keep any working tree or repository in place."
4189
#: bzrlib/builtins.py:6435
4200
#: bzrlib/builtins.py:6468
4190
4201
msgid " Remove the branch at repo/trunk::"
4193
#: bzrlib/builtins.py:6437
4204
#: bzrlib/builtins.py:6470
4194
4205
msgid " bzr remove-branch repo/trunk"
4197
#: bzrlib/builtins.py:6444
4208
#: bzrlib/builtins.py:6477
4198
4209
msgid "Remove branch even if it is the active branch."
4201
#: bzrlib/builtins.py:6458
4212
#: bzrlib/builtins.py:6491
4202
4213
msgid "Branch is active. Use --force to remove it."
4205
#: bzrlib/builtins.py:6462
4216
#: bzrlib/builtins.py:6495
4206
4217
msgid "Plaintext diff output."
4209
#: bzrlib/builtins.py:6463
4220
#: bzrlib/builtins.py:6496
4210
4221
msgid "Temporarily set aside some changes from the current tree."
4213
#: bzrlib/builtins.py:6465
4224
#: bzrlib/builtins.py:6498
4215
4226
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4216
4227
"ie. out of the way, until a later time when you can bring them back from\n"
4271
#: bzrlib/builtins.py:6504
4282
#: bzrlib/builtins.py:6537
4272
4283
msgid "Shelve all changes."
4275
#: bzrlib/builtins.py:6506
4286
#: bzrlib/builtins.py:6539
4276
4287
msgid "Method to use for writing diffs."
4279
#: bzrlib/builtins.py:6506
4290
#: bzrlib/builtins.py:6539
4283
#: bzrlib/builtins.py:6510
4294
#: bzrlib/builtins.py:6543
4284
4295
msgid "List shelved changes."
4287
#: bzrlib/builtins.py:6512
4298
#: bzrlib/builtins.py:6545
4288
4299
msgid "Destroy removed changes instead of shelving them."
4291
#: bzrlib/builtins.py:6541
4302
#: bzrlib/builtins.py:6574
4292
4303
msgid "No shelved changes."
4295
#: bzrlib/builtins.py:6552
4306
#: bzrlib/builtins.py:6585
4296
4307
msgid "Restore shelved changes."
4299
#: bzrlib/builtins.py:6554
4310
#: bzrlib/builtins.py:6587
4301
4312
"By default, the most recently shelved changes are restored. However if you\n"
4302
4313
"specify a shelf by id those changes will be restored instead. This works\n"
4303
4314
"best when the changes don't depend on each other."
4306
#: bzrlib/builtins.py:6563
4317
#: bzrlib/builtins.py:6596
4307
4318
msgid "The action to perform."
4310
#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694
4321
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4314
#: bzrlib/builtins.py:6565
4325
#: bzrlib/builtins.py:6598
4315
4326
msgid "Apply changes and remove from the shelf."
4318
#: bzrlib/builtins.py:6566
4329
#: bzrlib/builtins.py:6599
4319
4330
msgid "Show changes, but do not apply or remove them."
4322
#: bzrlib/builtins.py:6567
4333
#: bzrlib/builtins.py:6600
4324
4335
"Instead of unshelving the changes, show the diff that would result from "
4328
#: bzrlib/builtins.py:6569
4339
#: bzrlib/builtins.py:6602
4329
4340
msgid "Delete changes without applying them."
4332
#: bzrlib/builtins.py:6570
4343
#: bzrlib/builtins.py:6603
4333
4344
msgid "Apply changes but don't delete them."
4336
#: bzrlib/builtins.py:6585
4347
#: bzrlib/builtins.py:6618
4337
4348
msgid "Remove unwanted files from working tree."
4340
#: bzrlib/builtins.py:6587
4351
#: bzrlib/builtins.py:6620
4342
4353
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4343
4354
"files are never deleted."
4346
#: bzrlib/builtins.py:6590
4357
#: bzrlib/builtins.py:6623
4348
4359
"Another class is 'detritus', which includes files emitted by bzr during\n"
4349
4360
"normal operations and selftests. (The value of these files decreases with\n"
4353
#: bzrlib/builtins.py:6594
4364
#: bzrlib/builtins.py:6627
4355
4366
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4356
4367
"flags are respected, and may be combined."
4359
#: bzrlib/builtins.py:6597
4370
#: bzrlib/builtins.py:6630
4360
4371
msgid "To check what clean-tree will do, use --dry-run."
4363
#: bzrlib/builtins.py:6600
4374
#: bzrlib/builtins.py:6633
4364
4375
msgid "Delete all ignored files."
4367
#: bzrlib/builtins.py:6601
4378
#: bzrlib/builtins.py:6634
4369
4380
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4372
#: bzrlib/builtins.py:6604
4383
#: bzrlib/builtins.py:6637
4373
4384
msgid "Delete files unknown to bzr (default)."
4376
#: bzrlib/builtins.py:6605
4387
#: bzrlib/builtins.py:6638
4377
4388
msgid "Show files to delete instead of deleting them."
4380
#: bzrlib/builtins.py:6607
4391
#: bzrlib/builtins.py:6640
4381
4392
msgid "Do not prompt before deleting."
9944
9939
"of bzr that requires authentication (smtp for example)."
9947
#: en/help_topics/configuration.txt:379
9942
#: en/help_topics/configuration.txt:391
9949
9944
"The syntax of the file obeys the same rules as the others except for the\n"
9950
9945
"option policies which don't apply."
9953
#: en/help_topics/configuration.txt:382
9948
#: en/help_topics/configuration.txt:394
9955
9950
"For more information on the possible uses of the authentication "
9956
9951
"configuration\n"
9957
9952
"file see :doc:`authentication-help`."
9960
#: en/help_topics/configuration.txt:385
9955
#: en/help_topics/configuration.txt:397
9963
9958
"Common options\n"
9964
9959
"--------------"
9967
#: en/help_topics/configuration.txt:389
9962
#: en/help_topics/configuration.txt:401
9969
9964
"debug_flags\n"
9973
#: en/help_topics/configuration.txt:392
9968
#: en/help_topics/configuration.txt:404
9975
9970
"A comma-separated list of debugging options to turn on. The same values\n"
9976
9971
"can be used as with the -D command-line option (see `help global-options`).\n"
9977
9972
"For example::"
9980
#: en/help_topics/configuration.txt:396
9975
#: en/help_topics/configuration.txt:408
9981
9976
msgid " debug_flags = hpss"
9984
#: en/help_topics/configuration.txt:400
9979
#: en/help_topics/configuration.txt:412
9985
9980
msgid " debug_flags = hpss,evil"
9988
#: en/help_topics/configuration.txt:402
9983
#: en/help_topics/configuration.txt:414
9994
#: en/help_topics/configuration.txt:405
9989
#: en/help_topics/configuration.txt:417
9996
9991
"The email address to use when committing a branch. Typically takes the form\n"
10000
#: en/help_topics/configuration.txt:408
9995
#: en/help_topics/configuration.txt:420
10001
9996
msgid " email = Full Name <account@hostname.tld>"
10004
#: en/help_topics/configuration.txt:410
9999
#: en/help_topics/configuration.txt:422
10010
#: en/help_topics/configuration.txt:413
10005
#: en/help_topics/configuration.txt:425
10012
10007
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10013
10008
"a commit message. This setting is trumped by the environment variable\n"
10101
10096
"to sign newly committed revisions, even if the branch requires signatures."
10104
#: en/help_topics/configuration.txt:462
10099
#: en/help_topics/configuration.txt:474
10106
10101
"dirstate.fdatasync\n"
10107
10102
"~~~~~~~~~~~~~~~~~~"
10110
#: en/help_topics/configuration.txt:465
10105
#: en/help_topics/configuration.txt:477
10112
10107
"If true (default), working tree metadata changes are flushed through the\n"
10113
10108
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10114
10109
"should not be lost if the machine crashes. See also repository.fdatasync."
10117
#: en/help_topics/configuration.txt:469
10112
#: en/help_topics/configuration.txt:481
10119
10114
"gpg_signing_key\n"
10120
10115
"~~~~~~~~~~~~~~~"
10123
#: en/help_topics/configuration.txt:472
10118
#: en/help_topics/configuration.txt:484
10125
10120
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10126
10121
"address, key fingerprint or full key ID. When unset or when set to\n"
10127
10122
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10130
#: en/help_topics/configuration.txt:476
10125
#: en/help_topics/configuration.txt:488
10136
#: en/help_topics/configuration.txt:479
10131
#: en/help_topics/configuration.txt:491
10138
10133
"Only useful in ``locations.conf``. Defines whether or not the\n"
10139
10134
"configuration for this section applies to subdirectories:"
10142
#: en/help_topics/configuration.txt:482
10137
#: en/help_topics/configuration.txt:494
10145
10140
" (default) This section applies to subdirectories as well."
10148
#: en/help_topics/configuration.txt:485
10143
#: en/help_topics/configuration.txt:497
10151
10146
" This section only applies to the branch at this directory and not\n"
10152
10147
" branches below it."
10155
#: en/help_topics/configuration.txt:489
10150
#: en/help_topics/configuration.txt:501
10157
10152
"gpg_signing_command\n"
10158
10153
"~~~~~~~~~~~~~~~~~~~"
10161
#: en/help_topics/configuration.txt:492
10156
#: en/help_topics/configuration.txt:504
10163
10158
"(Default: \"gpg\"). Which program should be used to sign and check "
10164
10159
"revisions.\n"
10165
10160
"For example::"
10168
#: en/help_topics/configuration.txt:495
10163
#: en/help_topics/configuration.txt:507
10169
10164
msgid " gpg_signing_command = /usr/bin/gnpg"
10172
#: en/help_topics/configuration.txt:497
10167
#: en/help_topics/configuration.txt:509
10174
10169
"The specified command must accept the options \"--clearsign\" and \"-u "
10178
#: en/help_topics/configuration.txt:499
10173
#: en/help_topics/configuration.txt:511
10180
10175
"bzr_remote_path\n"
10181
10176
"~~~~~~~~~~~~~~~"
10184
#: en/help_topics/configuration.txt:502
10179
#: en/help_topics/configuration.txt:514
10186
10181
"(Default: \"bzr\"). The path to the command that should be used to run the "
10188
10183
"server for bzr. This value may only be specified in locations.conf, because:"
10191
#: en/help_topics/configuration.txt:505
10186
#: en/help_topics/configuration.txt:517
10193
10188
"- it's needed before branch.conf is accessible\n"
10194
10189
"- allowing remote branch.conf files to specify commands would be a security\n"
10198
#: en/help_topics/configuration.txt:509
10193
#: en/help_topics/configuration.txt:521
10199
10194
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10202
#: en/help_topics/configuration.txt:511
10197
#: en/help_topics/configuration.txt:523
10204
10199
"smtp_server\n"
10205
10200
"~~~~~~~~~~~"
10208
#: en/help_topics/configuration.txt:514
10203
#: en/help_topics/configuration.txt:526
10210
10205
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10211
10206
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10214
#: en/help_topics/configuration.txt:517
10209
#: en/help_topics/configuration.txt:529
10216
10211
"smtp_username, smtp_password\n"
10217
10212
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10220
#: en/help_topics/configuration.txt:520
10215
#: en/help_topics/configuration.txt:532
10222
10217
"User and password to authenticate to the SMTP server. If smtp_username\n"
10223
10218
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10426
10421
"--remember``."
10429
#: en/help_topics/configuration.txt:634
10424
#: en/help_topics/configuration.txt:646
10431
10426
"push_location\n"
10432
10427
"~~~~~~~~~~~~~"
10435
#: en/help_topics/configuration.txt:637
10430
#: en/help_topics/configuration.txt:649
10437
10432
"If present, the location of the default branch for push. This option\n"
10438
10433
"is normally set by the first ``push`` or ``push --remember``."
10441
#: en/help_topics/configuration.txt:640
10436
#: en/help_topics/configuration.txt:652
10443
10438
"push_strict\n"
10444
10439
"~~~~~~~~~~~"
10447
#: en/help_topics/configuration.txt:643
10442
#: en/help_topics/configuration.txt:655
10449
10444
"If present, defines the ``--strict`` option default value for checking\n"
10450
10445
"uncommitted changes before pushing."
10453
#: en/help_topics/configuration.txt:646
10448
#: en/help_topics/configuration.txt:658
10455
10450
"dpush_strict\n"
10456
10451
"~~~~~~~~~~~~"
10459
#: en/help_topics/configuration.txt:649
10454
#: en/help_topics/configuration.txt:661
10461
10456
"If present, defines the ``--strict`` option default value for checking\n"
10462
10457
"uncommitted changes before pushing into a different VCS without any\n"
10463
10458
"custom bzr metadata."
10466
#: en/help_topics/configuration.txt:653
10461
#: en/help_topics/configuration.txt:665
10468
10463
"bound_location\n"
10469
10464
"~~~~~~~~~~~~~~"
10472
#: en/help_topics/configuration.txt:656
10467
#: en/help_topics/configuration.txt:668
10474
10469
"The location that commits should go to when acting as a checkout.\n"
10475
10470
"This option is normally set by ``bind``."
10478
#: en/help_topics/configuration.txt:659
10473
#: en/help_topics/configuration.txt:671
10484
#: en/help_topics/configuration.txt:662
10479
#: en/help_topics/configuration.txt:674
10486
10481
"If set to \"True\", the branch should act as a checkout, and push each "
10487
10482
"commit to\n"
10488
10483
"the bound_location. This option is normally set by ``bind``/``unbind``."
10491
#: en/help_topics/configuration.txt:665
10486
#: en/help_topics/configuration.txt:677
10493
10488
"send_strict\n"
10494
10489
"~~~~~~~~~~~"
10497
#: en/help_topics/configuration.txt:668
10492
#: en/help_topics/configuration.txt:680
10499
10494
"If present, defines the ``--strict`` option default value for checking\n"
10500
10495
"uncommitted changes before sending a merge directive."
10503
#: en/help_topics/configuration.txt:671
10498
#: en/help_topics/configuration.txt:683
10505
10500
"add.maximum_file_size\n"
10506
10501
"~~~~~~~~~~~~~~~~~~~~~"
10509
#: en/help_topics/configuration.txt:674
10504
#: en/help_topics/configuration.txt:686
10511
10506
"Defines the maximum file size the command line \"add\" operation will allow\n"
10512
10507
"in recursive mode, with files larger than this value being skipped. You may "