511
#: bzrlib/builtins.py:1180
511
#: bzrlib/builtins.py:1189
512
512
msgid "Need working tree for --show-base."
515
#: bzrlib/builtins.py:1196
515
#: bzrlib/builtins.py:1205
516
516
msgid "No pull location known or specified."
519
#: bzrlib/builtins.py:1202
519
#: bzrlib/builtins.py:1211
521
521
msgid "Using saved parent location: %s\n"
524
#: bzrlib/builtins.py:1209 bzrlib/builtins.py:4406
524
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
525
525
msgid "Cannot use -r with merge directives or bundles"
528
#: bzrlib/builtins.py:1252
528
#: bzrlib/builtins.py:1261
529
529
msgid "Update a mirror of this branch."
532
#: bzrlib/builtins.py:1254
532
#: bzrlib/builtins.py:1263
534
534
"The target branch will not have its working tree populated because this\n"
535
535
"is both expensive, and is not supported on remote file systems."
538
#: bzrlib/builtins.py:1257
538
#: bzrlib/builtins.py:1266
540
540
"Some smart servers or protocols *may* put the working tree in place in\n"
544
#: bzrlib/builtins.py:1260
544
#: bzrlib/builtins.py:1269
546
546
"This command only works on branches that have not diverged. Branches are\n"
547
547
"considered diverged if the destination branch's most recent commit is one\n"
548
548
"that has not been merged (directly or indirectly) by the source branch."
551
#: bzrlib/builtins.py:1264
551
#: bzrlib/builtins.py:1273
553
553
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
554
554
"the other branch completely, discarding its unmerged changes."
557
#: bzrlib/builtins.py:1267
557
#: bzrlib/builtins.py:1276
559
559
"If you want to ensure you have the different changes in the other branch,\n"
560
560
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
561
561
"After that you will be able to do a push without '--overwrite'."
564
#: bzrlib/builtins.py:1271
564
#: bzrlib/builtins.py:1280
566
566
"If there is no default push location set, the first push will set it (use\n"
567
567
"--no-remember to avoid setting it). After that, you can omit the\n"
569
569
"value will only be saved if the remote location can be accessed."
572
#: bzrlib/builtins.py:1276
572
#: bzrlib/builtins.py:1285
574
574
"The --verbose option will display the revisions pushed using the log_format\n"
575
575
"configuration option. You can use a different format by overriding it with\n"
576
576
"-Olog_format=<other_format>."
579
#: bzrlib/builtins.py:1287 bzrlib/foreign.py:272
579
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
581
581
"Branch to push from, rather than the one containing the working directory."
584
#: bzrlib/builtins.py:1290
584
#: bzrlib/builtins.py:1299
586
586
"By default push will fail if the target directory exists, but does not "
587
587
"already have a control directory. This flag will allow push to proceed."
590
#: bzrlib/builtins.py:1295
590
#: bzrlib/builtins.py:1304
592
592
"Create a stacked branch that references the public location of the parent "
596
#: bzrlib/builtins.py:1298
596
#: bzrlib/builtins.py:1307
598
598
"Create a stacked branch that refers to another branch for the commit "
599
599
"history. Only the work not present in the referenced branch is included in "
600
600
"the branch created."
603
#: bzrlib/builtins.py:1303 bzrlib/foreign.py:279
603
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
605
605
"Refuse to push if there are uncommitted changes in the working tree, --no-"
606
606
"strict disables the check."
609
#: bzrlib/builtins.py:1306
609
#: bzrlib/builtins.py:1315
610
610
msgid "Don't populate the working tree, even for protocols that support it."
613
#: bzrlib/builtins.py:1350
613
#: bzrlib/builtins.py:1318
614
msgid "Overwrite tags only."
617
#: bzrlib/builtins.py:1369
614
618
msgid "Could not determine branch to refer to."
617
#: bzrlib/builtins.py:1359
621
#: bzrlib/builtins.py:1378
620
624
"No push location known or specified. To push to the parent branch (at %s), "
621
625
"use 'bzr push :parent'."
624
#: bzrlib/builtins.py:1365 bzrlib/foreign.py:306
628
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
625
629
msgid "No push location known or specified."
628
#: bzrlib/builtins.py:1369
632
#: bzrlib/builtins.py:1388
630
634
msgid "Using saved push location: %s"
633
#: bzrlib/builtins.py:1379
637
#: bzrlib/builtins.py:1398
634
638
msgid "Create a new branch that is a copy of an existing branch."
637
#: bzrlib/builtins.py:1381
641
#: bzrlib/builtins.py:1400
639
643
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
640
644
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
645
649
"create ./foo-bar."
648
#: bzrlib/builtins.py:1388
652
#: bzrlib/builtins.py:1407
650
654
"To retrieve the branch as of a particular revision, supply the --revision\n"
651
655
"parameter, as in \"branch foo/bar -r 5\"."
654
#: bzrlib/builtins.py:1391
658
#: bzrlib/builtins.py:1410
655
659
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
658
#: bzrlib/builtins.py:1401
662
#: bzrlib/builtins.py:1420
659
663
msgid "Create a branch without a working-tree."
662
#: bzrlib/builtins.py:1403
666
#: bzrlib/builtins.py:1422
663
667
msgid "Switch the checkout in the current directory to the new branch."
666
#: bzrlib/builtins.py:1406
670
#: bzrlib/builtins.py:1425
668
672
"Create a stacked branch referring to the source branch. The new branch will "
669
673
"depend on the availability of the source branch for all operations."
672
#: bzrlib/builtins.py:1410
676
#: bzrlib/builtins.py:1429
673
677
msgid "Do not use a shared repository, even if available."
676
#: bzrlib/builtins.py:1412
680
#: bzrlib/builtins.py:1431
678
682
"By default branch will fail if the target directory exists, but does not "
679
683
"already have a control directory. This flag will allow branch to proceed."
682
#: bzrlib/builtins.py:1417
686
#: bzrlib/builtins.py:1436
683
687
msgid "Bind new branch to from location."
686
#: bzrlib/builtins.py:1464
690
#: bzrlib/builtins.py:1483
688
692
msgid "Target directory \"%s\" already exists."
691
#: bzrlib/builtins.py:1476
695
#: bzrlib/builtins.py:1495
693
697
msgid "Parent of \"%s\" does not exist."
696
#: bzrlib/builtins.py:1495
700
#: bzrlib/builtins.py:1514
697
701
msgid "The branch {0} has no revision {1}."
700
#: bzrlib/builtins.py:1510 bzrlib/push.py:53
704
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
702
706
msgid "Created new stacked branch referring to %s."
705
#: bzrlib/builtins.py:1514
709
#: bzrlib/builtins.py:1533
707
711
msgid "Branched %d revision."
708
712
msgid_plural "Branched %d revisions."
712
#: bzrlib/builtins.py:1519
716
#: bzrlib/builtins.py:1538
714
718
msgid "New branch bound to %s"
717
#: bzrlib/builtins.py:1524 bzrlib/builtins.py:6247
721
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
719
723
msgid "Switched to branch: %s"
722
#: bzrlib/builtins.py:1529
726
#: bzrlib/builtins.py:1548
723
727
msgid "List the branches available at the current location."
726
#: bzrlib/builtins.py:1531
730
#: bzrlib/builtins.py:1550
728
732
"This command will print the names of all the branches at the current\n"
732
#: bzrlib/builtins.py:1538
736
#: bzrlib/builtins.py:1557
734
738
"Recursively scan for branches rather than just looking in the specified "
738
#: bzrlib/builtins.py:1567
742
#: bzrlib/builtins.py:1586
739
743
msgid "(default)"
742
#: bzrlib/builtins.py:1579
746
#: bzrlib/builtins.py:1598
743
747
msgid "Create a new checkout of an existing branch."
746
#: bzrlib/builtins.py:1581
750
#: bzrlib/builtins.py:1600
748
752
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
838
842
"out the old content of that file to a new location."
841
#: bzrlib/builtins.py:1705
845
#: bzrlib/builtins.py:1724
843
847
"The 'dir' argument, if given, must be the location of the root of a\n"
844
848
"working tree to update. By default, the working tree that contains the \n"
845
849
"current working directory is used."
848
#: bzrlib/builtins.py:1721
852
#: bzrlib/builtins.py:1740
849
853
msgid "bzr update --revision takes exactly one revision"
852
#: bzrlib/builtins.py:1729
856
#: bzrlib/builtins.py:1748
853
857
msgid "bzr update can only update a whole tree, not a file or subdirectory"
856
#: bzrlib/builtins.py:1760
860
#: bzrlib/builtins.py:1779
857
861
msgid "Tree is up to date at revision {0} of branch {1}"
860
#: bzrlib/builtins.py:1776
864
#: bzrlib/builtins.py:1795
863
867
"branch has no revision %s\n"
864
868
"bzr update --revision only works for a revision in the branch history"
867
#: bzrlib/builtins.py:1782
871
#: bzrlib/builtins.py:1801
868
872
msgid "Updated to revision {0} of branch {1}"
871
#: bzrlib/builtins.py:1786
875
#: bzrlib/builtins.py:1805
873
877
"Your local commits will now show as pending merges with 'bzr status', and "
874
878
"can be committed with 'bzr commit'."
877
#: bzrlib/builtins.py:1795
881
#: bzrlib/builtins.py:1814
878
882
msgid "Show information about a working tree, branch or repository."
881
#: bzrlib/builtins.py:1797
885
#: bzrlib/builtins.py:1816
883
887
"This command will show all known locations and formats associated to the\n"
884
888
"tree, branch or repository."
887
#: bzrlib/builtins.py:1800
891
#: bzrlib/builtins.py:1819
889
893
"In verbose mode, statistical information is included with each report.\n"
890
894
"To see extended statistic information, use a verbosity level of 2 or\n"
891
895
"higher by specifying the verbose option multiple times, e.g. -vv."
894
#: bzrlib/builtins.py:1804
898
#: bzrlib/builtins.py:1823
895
899
msgid "Branches and working trees will also report any missing revisions."
898
#: bzrlib/builtins.py:1806 bzrlib/builtins.py:3725 bzrlib/builtins.py:4859
899
#: bzrlib/builtins.py:6433
902
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
903
#: bzrlib/builtins.py:6466
900
904
msgid ":Examples:"
903
#: bzrlib/builtins.py:1808
907
#: bzrlib/builtins.py:1827
904
908
msgid " Display information on the format and related locations:"
907
#: bzrlib/builtins.py:1810
911
#: bzrlib/builtins.py:1829
908
912
msgid " bzr info"
911
#: bzrlib/builtins.py:1812
915
#: bzrlib/builtins.py:1831
913
917
" Display the above together with extended format information and\n"
914
918
" basic statistics (like the number of files in the working tree and\n"
915
919
" number of revisions in the branch and repository):"
918
#: bzrlib/builtins.py:1816
922
#: bzrlib/builtins.py:1835
919
923
msgid " bzr info -v"
922
#: bzrlib/builtins.py:1818
926
#: bzrlib/builtins.py:1837
923
927
msgid " Display the above together with number of committers to the branch:"
926
#: bzrlib/builtins.py:1820
930
#: bzrlib/builtins.py:1839
927
931
msgid " bzr info -vv"
930
#: bzrlib/builtins.py:1839
934
#: bzrlib/builtins.py:1858
931
935
msgid "Remove files or directories."
934
#: bzrlib/builtins.py:1841
938
#: bzrlib/builtins.py:1860
936
940
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
937
941
"delete them if they can easily be recovered using revert otherwise they\n"
938
"will be backed up (adding an extention of the form .~#~). If no options or\n"
942
"will be backed up (adding an extension of the form .~#~). If no options or\n"
939
943
"parameters are given Bazaar will scan for files that are being tracked by\n"
940
944
"Bazaar but missing in your tree and stop tracking them for you."
943
#: bzrlib/builtins.py:1849
947
#: bzrlib/builtins.py:1868
944
948
msgid "Only remove files that have never been committed."
947
#: bzrlib/builtins.py:1851
951
#: bzrlib/builtins.py:1870
948
952
msgid "The file deletion mode to be used."
951
#: bzrlib/builtins.py:1852
955
#: bzrlib/builtins.py:1871
952
956
msgid "Deletion Strategy"
955
#: bzrlib/builtins.py:1853
959
#: bzrlib/builtins.py:1872
956
960
msgid "Backup changed files (default)."
959
#: bzrlib/builtins.py:1854
963
#: bzrlib/builtins.py:1873
960
964
msgid "Delete from bzr but leave the working copy."
963
#: bzrlib/builtins.py:1855
967
#: bzrlib/builtins.py:1874
964
968
msgid "Don't backup changed files."
967
#: bzrlib/builtins.py:1856
971
#: bzrlib/builtins.py:1875
969
973
"Delete all the specified files, even if they can not be recovered and even "
970
974
"if they are non-empty directories. (deprecated, use no-backup)"
973
#: bzrlib/builtins.py:1865
977
#: bzrlib/builtins.py:1884
974
978
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
977
#: bzrlib/builtins.py:1882
981
#: bzrlib/builtins.py:1901
978
982
msgid "No matching files."
981
#: bzrlib/builtins.py:1943
985
#: bzrlib/builtins.py:1962
982
986
msgid "Reconcile bzr metadata in a branch."
985
#: bzrlib/builtins.py:1945
989
#: bzrlib/builtins.py:1964
987
991
"This can correct data mismatches that may have been caused by\n"
988
992
"previous ghost operations or bzr upgrades. You should only\n"
1062
1066
" bzr commit -m \"imported project\""
1065
#: bzrlib/builtins.py:2052
1069
#: bzrlib/builtins.py:2071
1067
1071
"Create the path leading up to the branch if it does not already exist."
1070
#: bzrlib/builtins.py:2055
1074
#: bzrlib/builtins.py:2074
1071
1075
msgid "Specify a format for this branch. See \"help formats\"."
1074
#: bzrlib/builtins.py:2063
1078
#: bzrlib/builtins.py:2082
1076
1080
"Never change revnos or the existing log. Append revisions to it only."
1079
#: bzrlib/builtins.py:2066
1083
#: bzrlib/builtins.py:2085
1080
1084
msgid "Create a branch without a working tree."
1083
#: bzrlib/builtins.py:2086 bzrlib/push.py:110
1087
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1084
1088
#, python-format
1086
1090
"Parent directory of %s does not exist.\n"
1087
1091
"You may supply --create-prefix to create all leading parent directories."
1090
#: bzrlib/builtins.py:2120
1094
#: bzrlib/builtins.py:2139
1092
1096
"This branch format cannot be set to append-revisions-only. Try --default."
1095
#: bzrlib/builtins.py:2131
1099
#: bzrlib/builtins.py:2150
1096
1100
msgid "Created a {0} (format: {1})\n"
1099
#: bzrlib/builtins.py:2140
1103
#: bzrlib/builtins.py:2159
1100
1104
#, python-format
1101
1105
msgid "Using shared repository: %s\n"
1104
#: bzrlib/builtins.py:2144
1108
#: bzrlib/builtins.py:2163
1105
1109
msgid "Create a shared repository for branches to share storage space."
1108
#: bzrlib/builtins.py:2146
1112
#: bzrlib/builtins.py:2165
1110
1114
"New branches created under the repository directory will store their\n"
1111
1115
"revisions in the repository, not in the branch directory. For branches\n"
1198
1202
" 0 - no change"
1201
#: bzrlib/builtins.py:2231
1205
#: bzrlib/builtins.py:2250
1204
1208
" Shows the difference in the working tree versus the last commit::"
1207
#: bzrlib/builtins.py:2234
1211
#: bzrlib/builtins.py:2253
1208
1212
msgid " bzr diff"
1211
#: bzrlib/builtins.py:2236
1215
#: bzrlib/builtins.py:2255
1212
1216
msgid " Difference between the working tree and revision 1::"
1215
#: bzrlib/builtins.py:2238
1219
#: bzrlib/builtins.py:2257
1216
1220
msgid " bzr diff -r1"
1219
#: bzrlib/builtins.py:2240
1223
#: bzrlib/builtins.py:2259
1220
1224
msgid " Difference between revision 3 and revision 1::"
1223
#: bzrlib/builtins.py:2242
1227
#: bzrlib/builtins.py:2261
1224
1228
msgid " bzr diff -r1..3"
1227
#: bzrlib/builtins.py:2244
1231
#: bzrlib/builtins.py:2263
1228
1232
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1231
#: bzrlib/builtins.py:2246
1235
#: bzrlib/builtins.py:2265
1232
1236
msgid " bzr diff -r1..3 xxx"
1235
#: bzrlib/builtins.py:2248
1239
#: bzrlib/builtins.py:2267
1236
1240
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1239
#: bzrlib/builtins.py:2250
1243
#: bzrlib/builtins.py:2269
1240
1244
msgid " bzr diff -c2"
1243
#: bzrlib/builtins.py:2252
1247
#: bzrlib/builtins.py:2271
1245
1249
" To see the changes introduced by revision X::\n"
1247
1251
" bzr diff -cX"
1250
#: bzrlib/builtins.py:2256
1254
#: bzrlib/builtins.py:2275
1252
1256
" Note that in the case of a merge, the -c option shows the changes\n"
1253
1257
" compared to the left hand parent. To see the changes against\n"
1254
1258
" another parent, use::"
1257
#: bzrlib/builtins.py:2260
1261
#: bzrlib/builtins.py:2279
1258
1262
msgid " bzr diff -r<chosen_parent>..X"
1261
#: bzrlib/builtins.py:2262
1265
#: bzrlib/builtins.py:2281
1263
1267
" The changes between the current revision and the previous revision\n"
1264
1268
" (equivalent to -c-1 and -r-2..-1)"
1267
#: bzrlib/builtins.py:2265
1271
#: bzrlib/builtins.py:2284
1268
1272
msgid " bzr diff -r-2.."
1271
#: bzrlib/builtins.py:2267
1275
#: bzrlib/builtins.py:2286
1272
1276
msgid " Show just the differences for file NEWS::"
1275
#: bzrlib/builtins.py:2269
1279
#: bzrlib/builtins.py:2288
1276
1280
msgid " bzr diff NEWS"
1279
#: bzrlib/builtins.py:2271
1283
#: bzrlib/builtins.py:2290
1280
1284
msgid " Show the differences in working tree xxx for file NEWS::"
1283
#: bzrlib/builtins.py:2273
1287
#: bzrlib/builtins.py:2292
1284
1288
msgid " bzr diff xxx/NEWS"
1287
#: bzrlib/builtins.py:2275
1291
#: bzrlib/builtins.py:2294
1288
1292
msgid " Show the differences from branch xxx to this working tree:"
1291
#: bzrlib/builtins.py:2277
1295
#: bzrlib/builtins.py:2296
1292
1296
msgid " bzr diff --old xxx"
1295
#: bzrlib/builtins.py:2279
1299
#: bzrlib/builtins.py:2298
1296
1300
msgid " Show the differences between two branches for file NEWS::"
1299
#: bzrlib/builtins.py:2281
1303
#: bzrlib/builtins.py:2300
1300
1304
msgid " bzr diff --old xxx --new yyy NEWS"
1303
#: bzrlib/builtins.py:2283
1307
#: bzrlib/builtins.py:2302
1304
1308
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1307
#: bzrlib/builtins.py:2285
1311
#: bzrlib/builtins.py:2304
1309
1313
" bzr diff --prefix old/:new/\n"
1313
1317
" bzr diff --using /usr/bin/diff --diff-options -wu"
1316
#: bzrlib/builtins.py:2295
1320
#: bzrlib/builtins.py:2314
1317
1321
msgid "Pass these options to the external diff program."
1320
#: bzrlib/builtins.py:2298
1324
#: bzrlib/builtins.py:2317
1322
1326
"Set prefixes added to old and new filenames, as two values separated by a "
1323
1327
"colon. (eg \"old/:new/\")."
1326
#: bzrlib/builtins.py:2301
1330
#: bzrlib/builtins.py:2320
1327
1331
msgid "Branch/tree to compare from."
1330
#: bzrlib/builtins.py:2305
1334
#: bzrlib/builtins.py:2324
1331
1335
msgid "Branch/tree to compare to."
1334
#: bzrlib/builtins.py:2311
1338
#: bzrlib/builtins.py:2330
1335
1339
msgid "Use this command to compare files."
1338
#: bzrlib/builtins.py:2316
1342
#: bzrlib/builtins.py:2335
1339
1343
msgid "Diff format to use."
1342
#: bzrlib/builtins.py:2318
1346
#: bzrlib/builtins.py:2337
1343
1347
msgid "Diff format"
1346
#: bzrlib/builtins.py:2340
1350
#: bzrlib/builtins.py:2359
1347
1351
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1350
#: bzrlib/builtins.py:2344
1354
#: bzrlib/builtins.py:2363
1351
1355
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1354
#: bzrlib/builtins.py:2349 bzrlib/builtins.py:2746 bzrlib/builtins.py:2759
1355
#: bzrlib/builtins.py:2767 bzrlib/builtins.py:4933
1358
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1359
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1356
1360
msgid "{0} and {1} are mutually exclusive"
1359
#: bzrlib/builtins.py:2369
1363
#: bzrlib/builtins.py:2388
1361
1365
"List files deleted in the working tree.\n"
1365
#: bzrlib/builtins.py:2446
1369
#: bzrlib/builtins.py:2465
1366
1370
msgid "Show the tree root directory."
1369
#: bzrlib/builtins.py:2448
1373
#: bzrlib/builtins.py:2467
1371
1375
"The root is the nearest enclosing directory with a .bzr control\n"
1375
#: bzrlib/builtins.py:2463
1379
#: bzrlib/builtins.py:2482
1376
1380
msgid "The limit argument must be an integer."
1379
#: bzrlib/builtins.py:2471
1383
#: bzrlib/builtins.py:2490
1380
1384
msgid "The levels argument must be an integer."
1383
#: bzrlib/builtins.py:2476
1387
#: bzrlib/builtins.py:2495
1384
1388
msgid "Show historical log for a branch or subset of a branch."
1387
#: bzrlib/builtins.py:2478
1391
#: bzrlib/builtins.py:2497
1389
1393
"log is bzr's default tool for exploring the history of a branch.\n"
1390
1394
"The branch to use is taken from the first parameter. If no parameters\n"
1506
1510
" a nested merge revision and the log will be truncated accordingly."
1509
#: bzrlib/builtins.py:2552
1513
#: bzrlib/builtins.py:2571
1510
1514
msgid ":Path filtering:"
1513
#: bzrlib/builtins.py:2554
1517
#: bzrlib/builtins.py:2573
1515
1519
" If parameters are given and the first one is not a branch, the log\n"
1516
1520
" will be filtered to show only those revisions that changed the\n"
1517
1521
" nominated files or directories."
1520
#: bzrlib/builtins.py:2558
1524
#: bzrlib/builtins.py:2577
1522
1526
" Filenames are interpreted within their historical context. To log a\n"
1523
1527
" deleted file, specify a revision range so that the file existed at\n"
1524
1528
" the end or start of the range."
1527
#: bzrlib/builtins.py:2562
1531
#: bzrlib/builtins.py:2581
1529
1533
" Historical context is also important when interpreting pathnames of\n"
1530
1534
" renamed files/directories. Consider the following example:"
1533
#: bzrlib/builtins.py:2565
1537
#: bzrlib/builtins.py:2584
1535
1539
" * revision 1: add tutorial.txt\n"
1536
1540
" * revision 2: modify tutorial.txt\n"
1537
1541
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1540
#: bzrlib/builtins.py:2569
1544
#: bzrlib/builtins.py:2588
1541
1545
msgid " In this case:"
1544
#: bzrlib/builtins.py:2571
1548
#: bzrlib/builtins.py:2590
1545
1549
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1548
#: bzrlib/builtins.py:2573
1552
#: bzrlib/builtins.py:2592
1550
1554
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1553
#: bzrlib/builtins.py:2575
1557
#: bzrlib/builtins.py:2594
1555
1559
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1556
1560
" the original file in revision 2."
1559
#: bzrlib/builtins.py:2578
1563
#: bzrlib/builtins.py:2597
1561
1565
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1562
1566
" was no file called guide.txt in revision 2."
1565
#: bzrlib/builtins.py:2581
1569
#: bzrlib/builtins.py:2600
1567
1571
" Renames are always followed by log. By design, there is no need to\n"
1568
1572
" explicitly ask for this (and no way to stop logging a file back\n"
1569
1573
" until it was last renamed)."
1572
#: bzrlib/builtins.py:2585
1576
#: bzrlib/builtins.py:2604
1573
1577
msgid ":Other filtering:"
1576
#: bzrlib/builtins.py:2587
1580
#: bzrlib/builtins.py:2606
1578
1582
" The --match option can be used for finding revisions that match a\n"
1579
1583
" regular expression in a commit message, committer, author or bug.\n"
1645
1649
" trading disk space for faster speed."
1648
#: bzrlib/builtins.py:2634
1652
#: bzrlib/builtins.py:2653
1649
1653
msgid "Show from oldest to newest."
1652
#: bzrlib/builtins.py:2637
1656
#: bzrlib/builtins.py:2656
1653
1657
msgid "Show files changed in each revision."
1656
#: bzrlib/builtins.py:2643
1660
#: bzrlib/builtins.py:2662
1657
1661
msgid "Show just the specified revision. See also \"help revisionspec\"."
1660
#: bzrlib/builtins.py:2647
1664
#: bzrlib/builtins.py:2666
1661
1665
msgid "What names to list as authors - first, all or committer."
1664
#: bzrlib/builtins.py:2648
1668
#: bzrlib/builtins.py:2667
1665
1669
msgid "Authors"
1668
#: bzrlib/builtins.py:2653
1672
#: bzrlib/builtins.py:2672
1669
1673
msgid "Number of levels to display - 0 for all, 1 for flat."
1672
#: bzrlib/builtins.py:2663
1676
#: bzrlib/builtins.py:2682
1673
1677
msgid "Limit the output to the first N revisions."
1676
#: bzrlib/builtins.py:2668
1680
#: bzrlib/builtins.py:2687
1677
1681
msgid "Show changes made in each revision as a patch."
1680
#: bzrlib/builtins.py:2670
1684
#: bzrlib/builtins.py:2689
1681
1685
msgid "Show merged revisions like --levels 0 does."
1684
#: bzrlib/builtins.py:2674
1688
#: bzrlib/builtins.py:2693
1685
1689
msgid "Do not report commits with more than one parent."
1688
#: bzrlib/builtins.py:2676
1692
#: bzrlib/builtins.py:2695
1690
1694
"Display only the revisions that are not part of both ancestries (require -"
1694
#: bzrlib/builtins.py:2680
1698
#: bzrlib/builtins.py:2699
1695
1699
msgid "Show digital signature validity."
1698
#: bzrlib/builtins.py:2683
1702
#: bzrlib/builtins.py:2702
1699
1703
msgid "Show revisions whose properties match this expression."
1702
#: bzrlib/builtins.py:2687
1706
#: bzrlib/builtins.py:2706
1703
1707
msgid "Show revisions whose message matches this expression."
1706
#: bzrlib/builtins.py:2691
1710
#: bzrlib/builtins.py:2710
1707
1711
msgid "Show revisions whose committer matches this expression."
1710
#: bzrlib/builtins.py:2695
1714
#: bzrlib/builtins.py:2714
1711
1715
msgid "Show revisions whose authors match this expression."
1714
#: bzrlib/builtins.py:2699
1718
#: bzrlib/builtins.py:2718
1715
1719
msgid "Show revisions whose bugs match this expression."
1718
#: bzrlib/builtins.py:2753
1722
#: bzrlib/builtins.py:2772
1719
1723
msgid "--exclude-common-ancestry requires -r with two revisions"
1722
#: bzrlib/builtins.py:2781
1726
#: bzrlib/builtins.py:2800
1723
1727
#, python-format
1724
1728
msgid "Path unknown at end or start of revision range: %s"
1727
#: bzrlib/builtins.py:2898
1731
#: bzrlib/builtins.py:2917
1728
1732
#, python-format
1729
1733
msgid "bzr %s doesn't accept two revisions in different branches."
1732
#: bzrlib/builtins.py:2914
1736
#: bzrlib/builtins.py:2933
1733
1737
#, python-format
1734
1738
msgid "bzr %s --revision takes one or two values."
1737
#: bzrlib/builtins.py:2959
1741
#: bzrlib/builtins.py:2978
1739
1743
"List files in a tree.\n"
1743
#: bzrlib/builtins.py:2968
1747
#: bzrlib/builtins.py:2987
1744
1748
msgid "Recurse into subdirectories."
1747
#: bzrlib/builtins.py:2970
1751
#: bzrlib/builtins.py:2989
1748
1752
msgid "Print paths relative to the root of the branch."
1751
#: bzrlib/builtins.py:2972
1755
#: bzrlib/builtins.py:2991
1752
1756
msgid "Print unknown files."
1755
#: bzrlib/builtins.py:2973
1759
#: bzrlib/builtins.py:2992
1756
1760
msgid "Print versioned files."
1759
#: bzrlib/builtins.py:2976
1763
#: bzrlib/builtins.py:2995
1760
1764
msgid "Print ignored files."
1763
#: bzrlib/builtins.py:2978
1767
#: bzrlib/builtins.py:2997
1764
1768
msgid "List entries of a particular kind: file, directory, symlink."
1767
#: bzrlib/builtins.py:2991
1771
#: bzrlib/builtins.py:3010
1768
1772
msgid "invalid kind specified"
1771
#: bzrlib/builtins.py:2994
1775
#: bzrlib/builtins.py:3013
1772
1776
msgid "Cannot set both --verbose and --null"
1775
#: bzrlib/builtins.py:3003
1779
#: bzrlib/builtins.py:3022
1776
1780
msgid "cannot specify both --from-root and PATH"
1779
#: bzrlib/builtins.py:3090
1783
#: bzrlib/builtins.py:3109
1780
1784
msgid "Ignore specified files or patterns."
1783
#: bzrlib/builtins.py:3092
1787
#: bzrlib/builtins.py:3111
1784
1788
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1787
#: bzrlib/builtins.py:3094
1791
#: bzrlib/builtins.py:3113
1789
1793
"If a .bzrignore file does not exist, the ignore command\n"
1790
1794
"will create one and add the specified files or patterns to the newly\n"
1831
1835
" the shell on Unix."
1834
#: bzrlib/builtins.py:3123
1838
#: bzrlib/builtins.py:3142
1836
1840
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1837
1841
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1840
#: bzrlib/builtins.py:3126
1844
#: bzrlib/builtins.py:3145
1843
1847
" Ignore the top level Makefile::"
1846
#: bzrlib/builtins.py:3129
1850
#: bzrlib/builtins.py:3148
1847
1851
msgid " bzr ignore ./Makefile"
1850
#: bzrlib/builtins.py:3131
1854
#: bzrlib/builtins.py:3150
1851
1855
msgid " Ignore .class files in all directories...::"
1854
#: bzrlib/builtins.py:3133
1858
#: bzrlib/builtins.py:3152
1855
1859
msgid " bzr ignore \"*.class\""
1858
#: bzrlib/builtins.py:3135
1862
#: bzrlib/builtins.py:3154
1859
1863
msgid " ...but do not ignore \"special.class\"::"
1862
#: bzrlib/builtins.py:3137
1866
#: bzrlib/builtins.py:3156
1863
1867
msgid " bzr ignore \"!special.class\""
1866
#: bzrlib/builtins.py:3139
1870
#: bzrlib/builtins.py:3158
1867
1871
msgid " Ignore files whose name begins with the \"#\" character::"
1870
#: bzrlib/builtins.py:3141
1874
#: bzrlib/builtins.py:3160
1871
1875
msgid " bzr ignore \"RE:^#\""
1874
#: bzrlib/builtins.py:3143 bzrlib/builtins.py:3147
1878
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1875
1879
msgid " Ignore .o files under the lib directory::"
1878
#: bzrlib/builtins.py:3145
1882
#: bzrlib/builtins.py:3164
1879
1883
msgid " bzr ignore \"lib/**/*.o\""
1882
#: bzrlib/builtins.py:3149
1886
#: bzrlib/builtins.py:3168
1883
1887
msgid " bzr ignore \"RE:lib/.*\\.o\""
1886
#: bzrlib/builtins.py:3151
1890
#: bzrlib/builtins.py:3170
1887
1891
msgid " Ignore everything but the \"debian\" toplevel directory::"
1890
#: bzrlib/builtins.py:3153
1894
#: bzrlib/builtins.py:3172
1892
1896
" bzr ignore \"RE:(?!debian/).*\"\n"
1931
#: bzrlib/builtins.py:3219
1935
#: bzrlib/builtins.py:3238
1932
1936
msgid "List ignored files and the patterns that matched them."
1935
#: bzrlib/builtins.py:3221
1939
#: bzrlib/builtins.py:3240
1937
1941
"List all the ignored files and the ignore pattern that caused the file to\n"
1941
#: bzrlib/builtins.py:3224
1945
#: bzrlib/builtins.py:3243
1942
1946
msgid "Alternatively, to list just the files::"
1945
#: bzrlib/builtins.py:3226
1949
#: bzrlib/builtins.py:3245
1946
1950
msgid " bzr ls --ignored"
1949
#: bzrlib/builtins.py:3260
1953
#: bzrlib/builtins.py:3279
1950
1954
#, python-format
1951
1955
msgid "not a valid revision-number: %r"
1954
#: bzrlib/builtins.py:3267
1958
#: bzrlib/builtins.py:3286
1956
1960
"Export current or past revision to a destination directory or archive."
1959
#: bzrlib/builtins.py:3269
1963
#: bzrlib/builtins.py:3288
1960
1964
msgid "If no revision is specified this exports the last committed revision."
1963
#: bzrlib/builtins.py:3271
1967
#: bzrlib/builtins.py:3290
1965
1969
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1966
1970
"given, try to find the format with the extension. If no extension\n"
1967
1971
"is found exports to a directory (equivalent to --format=dir)."
1970
#: bzrlib/builtins.py:3275
1974
#: bzrlib/builtins.py:3294
1972
1976
"If root is supplied, it will be used as the root directory inside\n"
1973
1977
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1974
1978
"to the exported filename. The root option has no effect for 'dir' format."
1977
#: bzrlib/builtins.py:3279
1981
#: bzrlib/builtins.py:3298
1979
1983
"If branch is omitted then the branch containing the current working\n"
1980
1984
"directory will be used."
1983
#: bzrlib/builtins.py:3282
1987
#: bzrlib/builtins.py:3301
1985
1989
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1988
#: bzrlib/builtins.py:3284
1992
#: bzrlib/builtins.py:3303
1990
1994
" ================= =========================\n"
1991
1995
" Supported formats Autodetected by extension\n"
1998
2002
" ================= ========================="
2001
#: bzrlib/builtins.py:3298
2005
#: bzrlib/builtins.py:3317
2002
2006
msgid "Type of file to export to."
2005
#: bzrlib/builtins.py:3301
2009
#: bzrlib/builtins.py:3320
2006
2010
msgid "Apply content filters to export the convenient form."
2009
#: bzrlib/builtins.py:3305
2013
#: bzrlib/builtins.py:3324
2010
2014
msgid "Name of the root directory inside the exported file."
2013
#: bzrlib/builtins.py:3307
2017
#: bzrlib/builtins.py:3326
2015
2019
"Set modification time of files to that of the last revision in which it was "
2019
#: bzrlib/builtins.py:3310
2023
#: bzrlib/builtins.py:3329
2021
2025
"Export the working tree contents rather than that of the last revision."
2024
#: bzrlib/builtins.py:3329
2028
#: bzrlib/builtins.py:3348
2025
2029
msgid "--uncommitted requires a working tree"
2028
#: bzrlib/builtins.py:3338
2032
#: bzrlib/builtins.py:3357
2029
2033
#, python-format
2030
2034
msgid "Unsupported export format: %s"
2033
#: bzrlib/builtins.py:3342
2037
#: bzrlib/builtins.py:3361
2035
2039
"Write the contents of a file as of a given revision to standard output."
2038
#: bzrlib/builtins.py:3344
2042
#: bzrlib/builtins.py:3363
2039
2043
msgid "If no revision is nominated, the last revision is used."
2042
#: bzrlib/builtins.py:3346
2046
#: bzrlib/builtins.py:3365
2044
2048
"Note: Take care to redirect standard output when using this command on a\n"
2048
#: bzrlib/builtins.py:3352
2052
#: bzrlib/builtins.py:3371
2049
2053
msgid "The path name in the old tree."
2052
#: bzrlib/builtins.py:3353
2056
#: bzrlib/builtins.py:3372
2053
2057
msgid "Apply content filters to display the convenience form."
2056
#: bzrlib/builtins.py:3364
2060
#: bzrlib/builtins.py:3383
2057
2061
msgid "bzr cat --revision takes exactly one revision specifier"
2060
#: bzrlib/builtins.py:3389 bzrlib/builtins.py:3401
2064
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2061
2065
msgid "{0!r} is not present in revision {1}"
2064
#: bzrlib/builtins.py:3424
2068
#: bzrlib/builtins.py:3443
2065
2069
msgid "Commit changes into a new revision."
2068
#: bzrlib/builtins.py:3426
2072
#: bzrlib/builtins.py:3445
2070
2074
"An explanatory message needs to be given for each commit. This is\n"
2071
2075
"often done by using the --message option (getting the message from the\n"
2154
2158
" one or more bugs. See ``bzr help bugs`` for details."
2157
#: bzrlib/builtins.py:3484
2161
#: bzrlib/builtins.py:3503
2158
2162
msgid "Do not consider changes made to a given path."
2161
#: bzrlib/builtins.py:3487
2165
#: bzrlib/builtins.py:3506
2162
2166
msgid "Description of the new revision."
2165
#: bzrlib/builtins.py:3490
2169
#: bzrlib/builtins.py:3509
2166
2170
msgid "Commit even if nothing has changed."
2169
#: bzrlib/builtins.py:3494
2173
#: bzrlib/builtins.py:3513
2170
2174
msgid "Take commit message from this file."
2173
#: bzrlib/builtins.py:3496
2177
#: bzrlib/builtins.py:3515
2174
2178
msgid "Refuse to commit if there are unknown files in the working tree."
2177
#: bzrlib/builtins.py:3499
2181
#: bzrlib/builtins.py:3518
2179
2183
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2180
2184
"08:00:00 +0100'."
2183
#: bzrlib/builtins.py:3502
2187
#: bzrlib/builtins.py:3521
2184
2188
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2187
#: bzrlib/builtins.py:3505
2191
#: bzrlib/builtins.py:3524
2188
2192
msgid "Set the author's name, if it's different from the committer."
2191
#: bzrlib/builtins.py:3508
2195
#: bzrlib/builtins.py:3527
2193
2197
"Perform a local commit in a bound branch. Local commits are not pushed to "
2194
2198
"the master branch until a normal commit is performed."
2197
#: bzrlib/builtins.py:3514
2201
#: bzrlib/builtins.py:3533
2199
2203
"When no message is supplied, show the diff along with the status summary in "
2200
2204
"the message editor."
2203
#: bzrlib/builtins.py:3517
2207
#: bzrlib/builtins.py:3536
2205
2209
"When committing to a foreign version control system do not push data that "
2206
2210
"can not be natively represented."
2209
#: bzrlib/builtins.py:3535
2213
#: bzrlib/builtins.py:3554
2210
2214
#, python-format
2212
2216
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2222
2226
"Commit refused."
2225
#: bzrlib/builtins.py:3553
2229
#: bzrlib/builtins.py:3572
2226
2230
#, python-format
2227
2231
msgid "Unrecognized bug %s. Commit refused."
2230
#: bzrlib/builtins.py:3556
2234
#: bzrlib/builtins.py:3575
2231
2235
#, python-format
2234
2238
"Commit refused."
2237
#: bzrlib/builtins.py:3580
2241
#: bzrlib/builtins.py:3599
2238
2242
msgid "Could not parse --commit-time: "
2241
#: bzrlib/builtins.py:3620
2245
#: bzrlib/builtins.py:3639
2242
2246
msgid "please specify either --message or --file"
2245
#: bzrlib/builtins.py:3649
2249
#: bzrlib/builtins.py:3668
2246
2250
msgid "please specify a commit message with either --message or --file"
2249
#: bzrlib/builtins.py:3652
2253
#: bzrlib/builtins.py:3671
2251
2255
"Empty commit message specified. Please specify a commit message with either -"
2252
2256
"-message or --file or leave a blank message with --message \"\"."
2255
#: bzrlib/builtins.py:3672
2259
#: bzrlib/builtins.py:3691
2257
2261
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2258
2262
"-unchanged to force an empty commit."
2261
#: bzrlib/builtins.py:3676
2265
#: bzrlib/builtins.py:3695
2263
2267
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2264
2268
"resolve FILE\" to resolve."
2267
#: bzrlib/builtins.py:3680
2271
#: bzrlib/builtins.py:3699
2268
2272
msgid "Commit refused because there are unknown files in the working tree."
2271
#: bzrlib/builtins.py:3683
2275
#: bzrlib/builtins.py:3702
2274
2278
"To commit to master branch, run update and then commit.\n"
2275
2279
"You can also pass --local to commit to continue working disconnected."
2278
#: bzrlib/builtins.py:3691
2282
#: bzrlib/builtins.py:3710
2280
2284
"Validate working tree structure, branch consistency and repository history."
2283
#: bzrlib/builtins.py:3693
2287
#: bzrlib/builtins.py:3712
2285
2289
"This command checks various invariants about branch and repository storage\n"
2286
2290
"to detect data corruption or bzr bugs."
2289
#: bzrlib/builtins.py:3696
2293
#: bzrlib/builtins.py:3715
2291
2295
"The working tree and branch checks will only give output if a problem is\n"
2292
2296
"detected. The output fields of the repository check are:"
2295
#: bzrlib/builtins.py:3699
2299
#: bzrlib/builtins.py:3718
2298
2302
" This is just the number of revisions checked. It doesn't\n"
2299
2303
" indicate a problem."
2302
#: bzrlib/builtins.py:3703
2306
#: bzrlib/builtins.py:3722
2304
2308
"versionedfiles\n"
2305
2309
" This is just the number of versionedfiles checked. It\n"
2306
2310
" doesn't indicate a problem."
2309
#: bzrlib/builtins.py:3707
2313
#: bzrlib/builtins.py:3726
2311
2315
"unreferenced ancestors\n"
2312
2316
" Texts that are ancestors of other texts, but\n"
2330
2334
" indicate a problem."
2333
#: bzrlib/builtins.py:3722
2337
#: bzrlib/builtins.py:3741
2335
2339
"If no restrictions are specified, all Bazaar data that is found at the "
2337
2341
"location will be checked."
2340
#: bzrlib/builtins.py:3727
2344
#: bzrlib/builtins.py:3746
2341
2345
msgid " Check the tree and branch at 'foo'::"
2344
#: bzrlib/builtins.py:3729
2348
#: bzrlib/builtins.py:3748
2345
2349
msgid " bzr check --tree --branch foo"
2348
#: bzrlib/builtins.py:3731
2352
#: bzrlib/builtins.py:3750
2349
2353
msgid " Check only the repository at 'bar'::"
2352
#: bzrlib/builtins.py:3733
2356
#: bzrlib/builtins.py:3752
2353
2357
msgid " bzr check --repo bar"
2356
#: bzrlib/builtins.py:3735
2360
#: bzrlib/builtins.py:3754
2357
2361
msgid " Check everything at 'baz'::"
2360
#: bzrlib/builtins.py:3737
2364
#: bzrlib/builtins.py:3756
2361
2365
msgid " bzr check baz"
2364
#: bzrlib/builtins.py:3743
2368
#: bzrlib/builtins.py:3762
2365
2369
msgid "Check the branch related to the current directory."
2368
#: bzrlib/builtins.py:3745
2372
#: bzrlib/builtins.py:3764
2369
2373
msgid "Check the repository related to the current directory."
2372
#: bzrlib/builtins.py:3747
2376
#: bzrlib/builtins.py:3766
2373
2377
msgid "Check the working tree related to the current directory."
2376
#: bzrlib/builtins.py:3761
2380
#: bzrlib/builtins.py:3780
2377
2381
msgid "Upgrade a repository, branch or working tree to a newer format."
2380
#: bzrlib/builtins.py:3763
2384
#: bzrlib/builtins.py:3782
2382
2386
"When the default format has changed after a major new release of\n"
2383
2387
"Bazaar, you may be informed during certain operations that you\n"
2418
#: bzrlib/builtins.py:3789
2422
#: bzrlib/builtins.py:3808
2420
2424
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2421
2425
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2424
#: bzrlib/builtins.py:3797
2428
#: bzrlib/builtins.py:3816
2425
2429
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2428
#: bzrlib/builtins.py:3801
2432
#: bzrlib/builtins.py:3820
2429
2433
msgid "Branch format"
2432
#: bzrlib/builtins.py:3803
2436
#: bzrlib/builtins.py:3822
2433
2437
msgid "Remove the backup.bzr directory if successful."
2436
#: bzrlib/builtins.py:3805
2440
#: bzrlib/builtins.py:3824
2437
2441
msgid "Show what would be done, but don't actually do anything."
2440
#: bzrlib/builtins.py:3820
2444
#: bzrlib/builtins.py:3839
2441
2445
msgid "Show or set bzr user id."
2444
#: bzrlib/builtins.py:3822
2448
#: bzrlib/builtins.py:3841
2447
2451
" Show the email of the current user::"
2450
#: bzrlib/builtins.py:3825
2454
#: bzrlib/builtins.py:3844
2451
2455
msgid " bzr whoami --email"
2454
#: bzrlib/builtins.py:3827
2458
#: bzrlib/builtins.py:3846
2455
2459
msgid " Set the current user::"
2458
#: bzrlib/builtins.py:3829
2462
#: bzrlib/builtins.py:3848
2459
2463
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2462
#: bzrlib/builtins.py:3833
2466
#: bzrlib/builtins.py:3852
2463
2467
msgid "Display email address only."
2466
#: bzrlib/builtins.py:3835
2470
#: bzrlib/builtins.py:3854
2467
2471
msgid "Set identity for the current branch instead of globally."
2470
#: bzrlib/builtins.py:3861
2474
#: bzrlib/builtins.py:3880
2471
2475
msgid "--email can only be used to display existing identity"
2474
#: bzrlib/builtins.py:3885
2478
#: bzrlib/builtins.py:3904
2475
2479
msgid "Print or set the branch nickname."
2478
#: bzrlib/builtins.py:3887
2482
#: bzrlib/builtins.py:3906
2480
2484
"If unset, the colocated branch name is used for colocated branches, and\n"
2481
2485
"the branch directory name is used for other branches. To print the\n"
2482
2486
"current nickname, execute with no argument."
2485
#: bzrlib/builtins.py:3891
2489
#: bzrlib/builtins.py:3910
2487
2491
"Bound branches use the nickname of its master branch unless it is set\n"
2491
#: bzrlib/builtins.py:3911
2495
#: bzrlib/builtins.py:3930
2492
2496
msgid "Set/unset and display aliases."
2495
#: bzrlib/builtins.py:3913
2499
#: bzrlib/builtins.py:3932
2498
2502
" Show the current aliases::"
2501
#: bzrlib/builtins.py:3916
2505
#: bzrlib/builtins.py:3935
2502
2506
msgid " bzr alias"
2505
#: bzrlib/builtins.py:3918
2509
#: bzrlib/builtins.py:3937
2506
2510
msgid " Show the alias specified for 'll'::"
2509
#: bzrlib/builtins.py:3920
2513
#: bzrlib/builtins.py:3939
2510
2514
msgid " bzr alias ll"
2513
#: bzrlib/builtins.py:3922
2517
#: bzrlib/builtins.py:3941
2514
2518
msgid " Set an alias for 'll'::"
2517
#: bzrlib/builtins.py:3924
2521
#: bzrlib/builtins.py:3943
2518
2522
msgid " bzr alias ll=\"log --line -r-10..-1\""
2521
#: bzrlib/builtins.py:3926
2525
#: bzrlib/builtins.py:3945
2522
2526
msgid " To remove an alias for 'll'::"
2525
#: bzrlib/builtins.py:3928
2529
#: bzrlib/builtins.py:3947
2526
2530
msgid " bzr alias --remove ll"
2529
#: bzrlib/builtins.py:3933
2533
#: bzrlib/builtins.py:3952
2530
2534
msgid "Remove the alias."
2533
#: bzrlib/builtins.py:3951
2537
#: bzrlib/builtins.py:3970
2534
2538
msgid "bzr alias --remove expects an alias to remove."
2537
#: bzrlib/builtins.py:4132
2541
#: bzrlib/builtins.py:4151
2539
2543
"subunit not available. subunit needs to be installed to use --subunit."
2542
#: bzrlib/builtins.py:4149
2546
#: bzrlib/builtins.py:4168
2544
2548
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2547
#: bzrlib/builtins.py:4196
2551
#: bzrlib/builtins.py:4215
2548
2552
msgid "Show version of bzr."
2551
#: bzrlib/builtins.py:4200
2555
#: bzrlib/builtins.py:4219
2552
2556
msgid "Print just the version number."
2555
#: bzrlib/builtins.py:4219
2559
#: bzrlib/builtins.py:4238
2556
2560
msgid "It sure does!\n"
2559
#: bzrlib/builtins.py:4243
2563
#: bzrlib/builtins.py:4262
2560
2564
#, python-format
2561
2565
msgid "merge base is revision %s\n"
2564
#: bzrlib/builtins.py:4247
2568
#: bzrlib/builtins.py:4266
2565
2569
msgid "Perform a three-way merge."
2568
#: bzrlib/builtins.py:4249
2572
#: bzrlib/builtins.py:4268
2570
2574
"The source of the merge can be specified either in the form of a branch,\n"
2571
2575
"or in the form of a path to a file containing a merge directive generated\n"
2641
2645
"merge revision which has more than two parents."
2644
#: bzrlib/builtins.py:4296
2648
#: bzrlib/builtins.py:4315
2646
2650
"If one would like to merge changes from the working tree of the other\n"
2647
2651
"branch without merging any committed revisions, the --uncommitted option\n"
2648
2652
"can be given."
2651
#: bzrlib/builtins.py:4300
2655
#: bzrlib/builtins.py:4319
2653
2657
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2654
2658
"you to apply each diff hunk and file change, similar to \"shelve\"."
2657
#: bzrlib/builtins.py:4303
2661
#: bzrlib/builtins.py:4322
2660
2664
" To merge all new revisions from bzr.dev::"
2663
#: bzrlib/builtins.py:4306
2667
#: bzrlib/builtins.py:4325
2664
2668
msgid " bzr merge ../bzr.dev"
2667
#: bzrlib/builtins.py:4308
2671
#: bzrlib/builtins.py:4327
2668
2672
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2671
#: bzrlib/builtins.py:4310
2675
#: bzrlib/builtins.py:4329
2672
2676
msgid " bzr merge -r 82 ../bzr.dev"
2675
#: bzrlib/builtins.py:4312
2679
#: bzrlib/builtins.py:4331
2676
2680
msgid " To merge the changes introduced by 82, without previous changes::"
2679
#: bzrlib/builtins.py:4314
2683
#: bzrlib/builtins.py:4333
2680
2684
msgid " bzr merge -r 81..82 ../bzr.dev"
2683
#: bzrlib/builtins.py:4316
2687
#: bzrlib/builtins.py:4335
2684
2688
msgid " To apply a merge directive contained in /tmp/merge::"
2687
#: bzrlib/builtins.py:4318
2691
#: bzrlib/builtins.py:4337
2688
2692
msgid " bzr merge /tmp/merge"
2691
#: bzrlib/builtins.py:4320
2695
#: bzrlib/builtins.py:4339
2693
2697
" To create a merge revision with three parents from two branches\n"
2694
2698
" feature1a and feature1b:"
2697
#: bzrlib/builtins.py:4323
2701
#: bzrlib/builtins.py:4342
2699
2703
" bzr merge ../feature1a\n"
2700
2704
" bzr merge ../feature1b --force\n"
2701
2705
" bzr commit -m 'revision with three parents'"
2704
#: bzrlib/builtins.py:4335
2708
#: bzrlib/builtins.py:4354
2705
2709
msgid "Merge even if the destination tree has uncommitted changes."
2708
#: bzrlib/builtins.py:4341
2712
#: bzrlib/builtins.py:4360
2710
2714
"Apply uncommitted changes from a working copy, instead of branch changes."
2713
#: bzrlib/builtins.py:4343
2717
#: bzrlib/builtins.py:4362
2715
2719
"If the destination is already completely merged into the source, pull from "
2716
2720
"the source rather than merging. When this happens, you do not need to "
2717
2721
"commit the result."
2720
#: bzrlib/builtins.py:4348
2724
#: bzrlib/builtins.py:4367
2722
2726
"Branch to merge into, rather than the one containing the working directory."
2725
#: bzrlib/builtins.py:4350
2729
#: bzrlib/builtins.py:4369
2726
2730
msgid "Instead of merging, show a diff of the merge."
2729
#: bzrlib/builtins.py:4352
2733
#: bzrlib/builtins.py:4371
2730
2734
msgid "Select changes interactively."
2733
#: bzrlib/builtins.py:4374
2737
#: bzrlib/builtins.py:4393
2735
2739
"Merging into empty branches not currently supported, "
2736
2740
"https://bugs.launchpad.net/bzr/+bug/308562"
2739
#: bzrlib/builtins.py:4401
2743
#: bzrlib/builtins.py:4420
2740
2744
msgid "Cannot use --uncommitted with bundles or merge directives."
2743
#: bzrlib/builtins.py:4412
2747
#: bzrlib/builtins.py:4431
2744
2748
msgid "Cannot use --uncommitted and --revision at the same time."
2747
#: bzrlib/builtins.py:4432
2751
#: bzrlib/builtins.py:4451
2748
2752
msgid "merger: "
2751
#: bzrlib/builtins.py:4434 bzrlib/bundle/apply_bundle.py:71
2755
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2752
2756
msgid "Nothing to do."
2755
#: bzrlib/builtins.py:4438
2759
#: bzrlib/builtins.py:4457
2756
2760
msgid "Cannot pull individual files"
2759
#: bzrlib/builtins.py:4446
2763
#: bzrlib/builtins.py:4465
2760
2764
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2763
#: bzrlib/builtins.py:4504
2767
#: bzrlib/builtins.py:4523
2764
2768
#, python-format
2765
2769
msgid "Show-base is not supported for this merge type. %s"
2768
#: bzrlib/builtins.py:4513
2772
#: bzrlib/builtins.py:4532
2769
2773
#, python-format
2770
2774
msgid "Conflict reduction is not supported for merge type %s."
2773
#: bzrlib/builtins.py:4517
2777
#: bzrlib/builtins.py:4536
2774
2778
msgid "Cannot do conflict reduction and show base."
2777
#: bzrlib/builtins.py:4628
2781
#: bzrlib/builtins.py:4647
2778
2782
msgid "No location specified or remembered"
2781
#: bzrlib/builtins.py:4630
2785
#: bzrlib/builtins.py:4649
2782
2786
msgid "{0} remembered {1} location {2}"
2785
#: bzrlib/builtins.py:4636
2789
#: bzrlib/builtins.py:4655
2786
2790
msgid "Redo a merge."
2789
#: bzrlib/builtins.py:4638
2793
#: bzrlib/builtins.py:4657
2791
2795
"Use this if you want to try a different merge technique while resolving\n"
2792
2796
"conflicts. Some merge techniques are better than others, and remerge\n"
2793
2797
"lets you try different ones on different files."
2796
#: bzrlib/builtins.py:4642
2800
#: bzrlib/builtins.py:4661
2798
2802
"The options for remerge have the same meaning and defaults as the ones for\n"
2799
2803
"merge. The difference is that remerge can (only) be run when there is a\n"
2800
2804
"pending merge, and it lets you specify particular files."
2803
#: bzrlib/builtins.py:4646
2807
#: bzrlib/builtins.py:4665
2806
2810
" Re-do the merge of all conflicted files, and show the base text in\n"
2807
2811
" conflict regions, in addition to the usual THIS and OTHER texts::"
2810
#: bzrlib/builtins.py:4650
2814
#: bzrlib/builtins.py:4669
2811
2815
msgid " bzr remerge --show-base"
2814
#: bzrlib/builtins.py:4652
2818
#: bzrlib/builtins.py:4671
2816
2820
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2817
2821
" additional processing to reduce the size of conflict regions::"
2820
#: bzrlib/builtins.py:4655
2824
#: bzrlib/builtins.py:4674
2821
2825
msgid " bzr remerge --merge-type weave --reprocess foobar"
2824
#: bzrlib/builtins.py:4662
2828
#: bzrlib/builtins.py:4681
2825
2829
msgid "Show base revision text in conflicts."
2828
#: bzrlib/builtins.py:4674
2832
#: bzrlib/builtins.py:4693
2830
2834
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2834
#: bzrlib/builtins.py:4731
2835
msgid "Revert files to a previous revision."
2838
#: bzrlib/builtins.py:4751
2840
"Set files in the working tree back to the contents of a previous revision."
2838
#: bzrlib/builtins.py:4733
2843
#: bzrlib/builtins.py:4753
2840
2845
"Giving a list of files will revert only those files. Otherwise, all files\n"
2841
2846
"will be reverted. If the revision is not specified with '--revision', the\n"
2842
"last committed revision is used."
2847
"working tree basis revision is used. A revert operation affects only the\n"
2848
"working tree, not any revision history like the branch and repository or\n"
2849
"the working tree basis revision."
2845
#: bzrlib/builtins.py:4737
2852
#: bzrlib/builtins.py:4759
2847
2854
"To remove only some changes, without reverting to a prior version, use\n"
2848
2855
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2849
2856
"will remove the changes introduced by the second last commit (-2), without\n"
2850
2857
"affecting the changes introduced by the last commit (-1). To remove\n"
2851
"certain changes on a hunk-by-hunk basis, see the shelve command."
2858
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2859
"To update the branch to a specific revision or the latest revision and\n"
2860
"update the working tree accordingly while preserving local changes, see the\n"
2854
#: bzrlib/builtins.py:4743
2864
#: bzrlib/builtins.py:4768
2856
"By default, any files that have been manually changed will be backed up\n"
2857
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2858
"'.~#~' appended to their name, where # is a number."
2866
"Uncommitted changes to files that are reverted will be discarded.\n"
2867
"Howver, by default, any files that have been manually changed will be\n"
2868
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2869
"files have '.~#~' appended to their name, where # is a number."
2861
#: bzrlib/builtins.py:4747
2872
#: bzrlib/builtins.py:4773
2863
2874
"When you provide files, you can use their current pathname or the pathname\n"
2864
2875
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2937
2948
" 0 - no missing revisions"
2940
#: bzrlib/builtins.py:4861
2951
#: bzrlib/builtins.py:4887
2942
2953
" Determine the missing revisions between this and the branch at the\n"
2943
2954
" remembered pull location::"
2946
#: bzrlib/builtins.py:4864
2957
#: bzrlib/builtins.py:4890
2947
2958
msgid " bzr missing"
2950
#: bzrlib/builtins.py:4866
2961
#: bzrlib/builtins.py:4892
2951
2962
msgid " Determine the missing revisions between this and another branch::"
2954
#: bzrlib/builtins.py:4868
2965
#: bzrlib/builtins.py:4894
2955
2966
msgid " bzr missing http://server/branch"
2958
#: bzrlib/builtins.py:4870
2969
#: bzrlib/builtins.py:4896
2960
2971
" Determine the missing revisions up to a specific revision on the other\n"
2964
#: bzrlib/builtins.py:4873
2975
#: bzrlib/builtins.py:4899
2965
2976
msgid " bzr missing -r ..-10"
2968
#: bzrlib/builtins.py:4875
2979
#: bzrlib/builtins.py:4901
2970
2981
" Determine the missing revisions up to a specific revision on this\n"
2974
#: bzrlib/builtins.py:4878
2985
#: bzrlib/builtins.py:4904
2975
2986
msgid " bzr missing --my-revision ..-10"
2978
#: bzrlib/builtins.py:4885
2989
#: bzrlib/builtins.py:4911
2979
2990
msgid "Reverse the order of revisions."
2982
#: bzrlib/builtins.py:4887
2993
#: bzrlib/builtins.py:4913
2983
2994
msgid "Display changes in the local branch only."
2986
#: bzrlib/builtins.py:4888
2997
#: bzrlib/builtins.py:4914
2987
2998
msgid "Same as --mine-only."
2990
#: bzrlib/builtins.py:4890
3001
#: bzrlib/builtins.py:4916
2991
3002
msgid "Display changes in the remote branch only."
2994
#: bzrlib/builtins.py:4891
3005
#: bzrlib/builtins.py:4917
2995
3006
msgid "Same as --theirs-only."
2998
#: bzrlib/builtins.py:4896
3009
#: bzrlib/builtins.py:4922
3000
3011
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3004
#: bzrlib/builtins.py:4900
3015
#: bzrlib/builtins.py:4926
3006
3017
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3010
#: bzrlib/builtins.py:4903
3021
#: bzrlib/builtins.py:4929
3011
3022
msgid "Show all revisions in addition to the mainline ones."
3014
#: bzrlib/builtins.py:4957
3025
#: bzrlib/builtins.py:4983
3015
3026
msgid "No peer location known or specified."
3018
#: bzrlib/builtins.py:4961
3029
#: bzrlib/builtins.py:4987
3019
3030
msgid "Using saved parent location: {0}\n"
3022
#: bzrlib/builtins.py:4994
3033
#: bzrlib/builtins.py:5020
3023
3034
#, python-format
3024
3035
msgid "You have %d extra revision:\n"
3025
3036
msgid_plural "You have %d extra revisions:\n"
3029
#: bzrlib/builtins.py:5010
3040
#: bzrlib/builtins.py:5040
3030
3041
#, python-format
3031
3042
msgid "You are missing %d revision:\n"
3032
3043
msgid_plural "You are missing %d revisions:\n"
3036
#: bzrlib/builtins.py:5022
3047
#: bzrlib/builtins.py:5055
3037
3048
msgid "This branch has no new revisions.\n"
3040
#: bzrlib/builtins.py:5025
3051
#: bzrlib/builtins.py:5058
3041
3052
msgid "Other branch has no new revisions.\n"
3044
#: bzrlib/builtins.py:5030
3055
#: bzrlib/builtins.py:5063
3045
3056
msgid "Branches are up to date.\n"
3048
#: bzrlib/builtins.py:5041
3059
#: bzrlib/builtins.py:5074
3049
3060
msgid "Compress the data within a repository."
3052
#: bzrlib/builtins.py:5043
3063
#: bzrlib/builtins.py:5076
3054
3065
"This operation compresses the data within a bazaar repository. As\n"
3055
3066
"bazaar supports automatic packing of repository, this operation is\n"
3056
3067
"normally not required to be done manually."
3059
#: bzrlib/builtins.py:5047
3070
#: bzrlib/builtins.py:5080
3061
3072
"During the pack operation, bazaar takes a backup of existing repository\n"
3062
3073
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3108
3119
"plugins using the Python programming language."
3111
#: bzrlib/builtins.py:5105
3122
#: bzrlib/builtins.py:5138
3112
3123
msgid "Show testament (signing-form) of a revision."
3115
#: bzrlib/builtins.py:5108
3126
#: bzrlib/builtins.py:5141
3116
3127
msgid "Produce long-format testament."
3119
#: bzrlib/builtins.py:5110
3130
#: bzrlib/builtins.py:5143
3120
3131
msgid "Produce a strict-format testament."
3123
#: bzrlib/builtins.py:5136
3134
#: bzrlib/builtins.py:5169
3124
3135
msgid "Show the origin of each line in a file."
3127
#: bzrlib/builtins.py:5138
3138
#: bzrlib/builtins.py:5171
3129
3140
"This prints out the given file with an annotation on the left side\n"
3130
3141
"indicating which revision, author and date introduced the change."
3133
#: bzrlib/builtins.py:5141
3144
#: bzrlib/builtins.py:5174
3135
3146
"If the origin is the same for a run of consecutive lines, it is\n"
3136
3147
"shown only at the top, unless the --all option is given."
3139
#: bzrlib/builtins.py:5149
3150
#: bzrlib/builtins.py:5182
3140
3151
msgid "Show annotations on all lines."
3143
#: bzrlib/builtins.py:5150
3154
#: bzrlib/builtins.py:5183
3144
3155
msgid "Show commit date in annotations."
3147
#: bzrlib/builtins.py:5237
3158
#: bzrlib/builtins.py:5270
3148
3159
msgid "Cannot sign a range of non-revision-history revisions"
3151
#: bzrlib/builtins.py:5249
3162
#: bzrlib/builtins.py:5282
3152
3163
msgid "Please supply either one revision, or a range."
3155
#: bzrlib/builtins.py:5253
3166
#: bzrlib/builtins.py:5286
3157
3168
"Convert the current branch into a checkout of the supplied branch.\n"
3158
3169
"If no branch is supplied, rebind to the last bound location."
3161
#: bzrlib/builtins.py:5256
3172
#: bzrlib/builtins.py:5289
3163
3174
"Once converted into a checkout, commits must succeed on the master branch\n"
3164
3175
"before they will be applied to the local branch."
3167
#: bzrlib/builtins.py:5259
3178
#: bzrlib/builtins.py:5292
3169
3180
"Bound branches use the nickname of its master branch unless it is set\n"
3170
3181
"locally, in which case binding will update the local nickname to be\n"
3171
3182
"that of the master."
3174
#: bzrlib/builtins.py:5274
3185
#: bzrlib/builtins.py:5307
3175
3186
msgid "No location supplied. This format does not remember old locations."
3178
#: bzrlib/builtins.py:5280
3189
#: bzrlib/builtins.py:5313
3179
3190
msgid "Branch is already bound"
3182
#: bzrlib/builtins.py:5283
3193
#: bzrlib/builtins.py:5316
3183
3194
msgid "No location supplied and no previous location known"
3186
#: bzrlib/builtins.py:5289
3197
#: bzrlib/builtins.py:5322
3187
3198
msgid "These branches have diverged. Try merging, and then bind again."
3190
#: bzrlib/builtins.py:5296
3201
#: bzrlib/builtins.py:5329
3191
3202
msgid "Convert the current checkout into a regular branch."
3194
#: bzrlib/builtins.py:5298
3205
#: bzrlib/builtins.py:5331
3196
3207
"After unbinding, the local branch is considered independent and subsequent\n"
3197
3208
"commits will be local only."
3200
#: bzrlib/builtins.py:5309
3211
#: bzrlib/builtins.py:5342
3201
3212
msgid "Local branch is not bound"
3204
#: bzrlib/builtins.py:5313
3215
#: bzrlib/builtins.py:5346
3205
3216
msgid "Remove the last committed revision."
3208
#: bzrlib/builtins.py:5315
3219
#: bzrlib/builtins.py:5348
3210
3221
"--verbose will print out what is being removed.\n"
3211
3222
"--dry-run will go through all the motions, but not actually\n"
3212
3223
"remove anything."
3215
#: bzrlib/builtins.py:5319
3226
#: bzrlib/builtins.py:5352
3217
3228
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3218
3229
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3219
3230
"branch at revision 15."
3222
#: bzrlib/builtins.py:5323
3233
#: bzrlib/builtins.py:5356
3224
3235
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3225
3236
"it may make is to restore any pending merges that were present before\n"
3229
#: bzrlib/builtins.py:5334
3240
#: bzrlib/builtins.py:5367
3230
3241
msgid "Don't actually make changes."
3233
#: bzrlib/builtins.py:5335
3244
#: bzrlib/builtins.py:5368
3234
3245
msgid "Say yes to all questions."
3237
#: bzrlib/builtins.py:5337
3248
#: bzrlib/builtins.py:5370
3238
3249
msgid "Keep tags that point to removed revisions."
3241
#: bzrlib/builtins.py:5339
3252
#: bzrlib/builtins.py:5372
3242
3253
msgid "Only remove the commits from the local branch when in a checkout."
3245
#: bzrlib/builtins.py:5388
3256
#: bzrlib/builtins.py:5421
3246
3257
msgid "No revisions to uncommit.\n"
3249
#: bzrlib/builtins.py:5403
3260
#: bzrlib/builtins.py:5436
3250
3261
msgid "Dry-run, pretending to remove the above revisions.\n"
3253
#: bzrlib/builtins.py:5406
3264
#: bzrlib/builtins.py:5439
3254
3265
msgid "The above revision(s) will be removed.\n"
3257
#: bzrlib/builtins.py:5410
3268
#: bzrlib/builtins.py:5443
3258
3269
msgid "Uncommit these revisions"
3261
#: bzrlib/builtins.py:5413
3272
#: bzrlib/builtins.py:5446
3262
3273
msgid "Canceled\n"
3265
#: bzrlib/builtins.py:5420
3276
#: bzrlib/builtins.py:5453
3266
3277
#, python-format
3268
3279
"You can restore the old tip by running:\n"
3269
3280
" bzr pull . -r revid:%s\n"
3272
#: bzrlib/builtins.py:5425
3283
#: bzrlib/builtins.py:5458
3273
3284
msgid "Break a dead lock."
3276
#: bzrlib/builtins.py:5427
3287
#: bzrlib/builtins.py:5460
3278
3289
"This command breaks a lock on a repository, branch, working directory or\n"
3282
#: bzrlib/builtins.py:5430
3293
#: bzrlib/builtins.py:5463
3284
3295
"CAUTION: Locks should only be broken when you are sure that the process\n"
3285
3296
"holding the lock has been stopped."
3288
#: bzrlib/builtins.py:5433
3299
#: bzrlib/builtins.py:5466
3290
3301
"You can get information on what locks are open via the 'bzr info\n"
3291
3302
"[location]' command."
3294
#: bzrlib/builtins.py:5436
3305
#: bzrlib/builtins.py:5469
3297
3308
" bzr break-lock\n"
3299
3310
" bzr break-lock --conf ~/.bazaar"
3302
#: bzrlib/builtins.py:5445
3313
#: bzrlib/builtins.py:5478
3303
3314
msgid "LOCATION is the directory where the config lock is."
3306
#: bzrlib/builtins.py:5447
3317
#: bzrlib/builtins.py:5480
3307
3318
msgid "Do not ask for confirmation before breaking the lock."
3310
#: bzrlib/builtins.py:5482
3321
#: bzrlib/builtins.py:5515
3311
3322
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3314
#: bzrlib/builtins.py:5483
3325
#: bzrlib/builtins.py:5516
3315
3326
msgid "Run the bzr server."
3318
#: bzrlib/builtins.py:5489
3329
#: bzrlib/builtins.py:5522
3319
3330
msgid "Serve on stdin/out for use from inetd or sshd."
3322
#: bzrlib/builtins.py:5490
3333
#: bzrlib/builtins.py:5523
3323
3334
msgid "protocol"
3326
#: bzrlib/builtins.py:5491
3337
#: bzrlib/builtins.py:5524
3327
3338
msgid "Protocol to serve."
3330
#: bzrlib/builtins.py:5495
3341
#: bzrlib/builtins.py:5528
3331
3342
msgid "Listen for connections on nominated address."
3334
#: bzrlib/builtins.py:5497
3345
#: bzrlib/builtins.py:5530
3336
3347
"Listen for connections on nominated port. Passing 0 as the port number will "
3337
3348
"result in a dynamically allocated port. The default port depends on the "
3341
#: bzrlib/builtins.py:5502
3352
#: bzrlib/builtins.py:5535
3342
3353
msgid "Serve contents of this directory."
3345
#: bzrlib/builtins.py:5504
3356
#: bzrlib/builtins.py:5537
3347
3358
"By default the server is a readonly server. Supplying --allow-writes "
3348
3359
"enables write access to the contents of the served directory and below. "
3351
3362
"uncontrolled write access to your file system."
3354
#: bzrlib/builtins.py:5513
3365
#: bzrlib/builtins.py:5546
3355
3366
msgid "Override the default idle client timeout (5min)."
3358
#: bzrlib/builtins.py:5531
3369
#: bzrlib/builtins.py:5564
3359
3370
msgid "Combine a tree into its containing tree."
3362
#: bzrlib/builtins.py:5533
3373
#: bzrlib/builtins.py:5566
3363
3374
msgid "This command requires the target tree to be in a rich-root format."
3366
#: bzrlib/builtins.py:5535
3377
#: bzrlib/builtins.py:5568
3368
3379
"The TREE argument should be an independent tree, inside another tree, but\n"
3369
3380
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3370
3381
"running \"bzr branch\" with the target inside a tree.)"
3373
#: bzrlib/builtins.py:5539
3384
#: bzrlib/builtins.py:5572
3375
3386
"The result is a combined tree, with the subtree no longer an independent\n"
3376
3387
"part. This is marked as a merge of the subtree into the containing tree,\n"
3377
3388
"and all history is preserved."
3380
#: bzrlib/builtins.py:5557
3391
#: bzrlib/builtins.py:5590
3381
3392
#, python-format
3383
3394
"Can't join trees because %s doesn't support rich root data.\n"
3384
3395
"You can use bzr upgrade on the repository."
3387
#: bzrlib/builtins.py:5567 bzrlib/builtins.py:5573
3398
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3388
3399
msgid "Cannot join {0}. {1}"
3391
#: bzrlib/builtins.py:5577
3402
#: bzrlib/builtins.py:5610
3392
3403
msgid "Split a subdirectory of a tree into a separate tree."
3395
#: bzrlib/builtins.py:5579
3406
#: bzrlib/builtins.py:5612
3397
3408
"This command will produce a target tree in a format that supports\n"
3398
3409
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3399
3410
"converted into earlier formats like 'dirstate-tags'."
3402
#: bzrlib/builtins.py:5583
3413
#: bzrlib/builtins.py:5616
3404
3415
"The TREE argument should be a subdirectory of a working tree. That\n"
3405
3416
"subdirectory will be converted into an independent tree, with its own\n"
3406
3417
"branch. Commits in the top-level tree will not apply to the new subtree."
3409
#: bzrlib/builtins.py:5663
3420
#: bzrlib/builtins.py:5696
3410
3421
msgid "No submit branch specified or known"
3413
#: bzrlib/builtins.py:5672 bzrlib/send.py:109
3424
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3414
3425
msgid "No public branch specified or known"
3417
#: bzrlib/builtins.py:5677
3428
#: bzrlib/builtins.py:5710
3418
3429
msgid "bzr merge-directive takes at most two one revision identifiers"
3421
#: bzrlib/builtins.py:5686
3432
#: bzrlib/builtins.py:5719
3422
3433
msgid "No revisions to bundle."
3425
#: bzrlib/builtins.py:5705
3436
#: bzrlib/builtins.py:5738
3426
3437
msgid "Mail or create a merge-directive for submitting changes."
3429
#: bzrlib/builtins.py:5707
3440
#: bzrlib/builtins.py:5740
3430
3441
msgid "A merge directive provides many things needed for requesting merges:"
3433
#: bzrlib/builtins.py:5709
3444
#: bzrlib/builtins.py:5742
3434
3445
msgid "* A machine-readable description of the merge to perform"
3437
#: bzrlib/builtins.py:5711
3448
#: bzrlib/builtins.py:5744
3438
3449
msgid "* An optional patch that is a preview of the changes requested"
3441
#: bzrlib/builtins.py:5713
3452
#: bzrlib/builtins.py:5746
3443
3454
"* An optional bundle of revision data, so that the changes can be applied\n"
3444
3455
" directly from the merge directive, without retrieving data from a\n"
3448
#: bzrlib/builtins.py:5717
3459
#: bzrlib/builtins.py:5750
3450
3461
"`bzr send` creates a compact data set that, when applied using bzr\n"
3451
3462
"merge, has the same effect as merging from the source branch. "
3454
#: bzrlib/builtins.py:5720
3465
#: bzrlib/builtins.py:5753
3456
3467
"By default the merge directive is self-contained and can be applied to any\n"
3457
3468
"branch containing submit_branch in its ancestory without needing access to\n"
3458
3469
"the source branch."
3461
#: bzrlib/builtins.py:5724
3472
#: bzrlib/builtins.py:5757
3463
3474
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3464
3475
"revisions, but only a structured request to merge from the\n"
3550
3561
"set them, and use `bzr info` to display them."
3553
#: bzrlib/builtins.py:5799
3564
#: bzrlib/builtins.py:5832
3554
3565
msgid "Write merge directive to this file or directory; use - for stdout."
3557
#: bzrlib/builtins.py:5803
3568
#: bzrlib/builtins.py:5836
3559
3570
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3560
3571
"strict disables the check."
3563
#: bzrlib/builtins.py:5805
3574
#: bzrlib/builtins.py:5838
3564
3575
msgid "Mail the request to this address."
3567
#: bzrlib/builtins.py:5809
3578
#: bzrlib/builtins.py:5842
3568
3579
msgid "Body for the email."
3571
#: bzrlib/builtins.py:5862
3582
#: bzrlib/builtins.py:5895
3572
3583
msgid "Do not include a bundle in the merge directive."
3575
#: bzrlib/builtins.py:5863
3586
#: bzrlib/builtins.py:5896
3576
3587
msgid "Do not include a preview patch in the merge directive."
3579
#: bzrlib/builtins.py:5866
3590
#: bzrlib/builtins.py:5899
3580
3591
msgid "Remember submit and public branch."
3583
#: bzrlib/builtins.py:5868
3594
#: bzrlib/builtins.py:5901
3585
3596
"Branch to generate the submission from, rather than the one containing the "
3586
3597
"working directory."
3589
#: bzrlib/builtins.py:5878 bzrlib/cmd_version_info.py:76
3600
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3593
#: bzrlib/builtins.py:5879
3604
#: bzrlib/builtins.py:5912
3594
3605
msgid "Use the specified output format."
3597
#: bzrlib/builtins.py:5901
3608
#: bzrlib/builtins.py:5934
3598
3609
msgid "Create, remove or modify a tag naming a revision."
3601
#: bzrlib/builtins.py:5903
3612
#: bzrlib/builtins.py:5936
3603
3614
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3604
3615
"(--revision) option can be given -rtag:X, where X is any previously\n"
3608
#: bzrlib/builtins.py:5907
3619
#: bzrlib/builtins.py:5940
3610
3621
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3611
3622
"along when you branch, push, pull or merge."
3614
#: bzrlib/builtins.py:5910
3625
#: bzrlib/builtins.py:5943
3616
3627
"It is an error to give a tag name that already exists unless you pass\n"
3617
3628
"--force, in which case the tag is moved to point to the new revision."
3620
#: bzrlib/builtins.py:5913
3631
#: bzrlib/builtins.py:5946
3622
3633
"To rename a tag (change the name but keep it on the same revsion), run "
3624
3635
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3627
#: bzrlib/builtins.py:5916
3638
#: bzrlib/builtins.py:5949
3629
3640
"If no tag name is specified it will be determined through the \n"
3630
3641
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3635
#: bzrlib/builtins.py:5926
3646
#: bzrlib/builtins.py:5959
3636
3647
msgid "Delete this tag rather than placing it."
3639
#: bzrlib/builtins.py:5929
3650
#: bzrlib/builtins.py:5962
3640
3651
msgid "Branch in which to place the tag."
3643
#: bzrlib/builtins.py:5931
3654
#: bzrlib/builtins.py:5964
3644
3655
msgid "Replace existing tags."
3647
#: bzrlib/builtins.py:5946
3658
#: bzrlib/builtins.py:5979
3648
3659
msgid "No tag specified to delete."
3651
#: bzrlib/builtins.py:5948
3662
#: bzrlib/builtins.py:5981
3652
3663
#, python-format
3653
3664
msgid "Deleted tag %s."
3656
#: bzrlib/builtins.py:5962
3667
#: bzrlib/builtins.py:5995
3657
3668
msgid "Please specify a tag name."
3660
#: bzrlib/builtins.py:5970
3671
#: bzrlib/builtins.py:6003
3661
3672
#, python-format
3662
3673
msgid "Tag %s already exists for that revision."
3665
#: bzrlib/builtins.py:5974
3676
#: bzrlib/builtins.py:6007
3666
3677
#, python-format
3667
3678
msgid "Created tag %s."
3670
#: bzrlib/builtins.py:5976
3681
#: bzrlib/builtins.py:6009
3671
3682
#, python-format
3672
3683
msgid "Updated tag %s."
3675
#: bzrlib/builtins.py:5980
3686
#: bzrlib/builtins.py:6013
3676
3687
msgid "List tags."
3679
#: bzrlib/builtins.py:5982
3690
#: bzrlib/builtins.py:6015
3681
3692
"This command shows a table of tag names and the revisions they reference."
3684
#: bzrlib/builtins.py:5988
3695
#: bzrlib/builtins.py:6021
3685
3696
msgid "Branch whose tags should be displayed."
3688
#: bzrlib/builtins.py:5990
3699
#: bzrlib/builtins.py:6023
3689
3700
msgid "Sort tags by different criteria."
3692
#: bzrlib/builtins.py:5990
3703
#: bzrlib/builtins.py:6023
3693
3704
msgid "Sorting"
3696
#: bzrlib/builtins.py:6059
3707
#: bzrlib/builtins.py:6092
3697
3708
msgid "Reconfigure the type of a bzr directory."
3700
#: bzrlib/builtins.py:6061
3711
#: bzrlib/builtins.py:6094
3701
3712
msgid "A target configuration must be specified."
3704
#: bzrlib/builtins.py:6063
3715
#: bzrlib/builtins.py:6096
3706
3717
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3707
3718
"The order of preference is\n"
3712
3723
"If none of these is available, --bind-to must be specified."
3715
#: bzrlib/builtins.py:6077
3726
#: bzrlib/builtins.py:6110
3716
3727
msgid "Tree type"
3719
#: bzrlib/builtins.py:6078
3730
#: bzrlib/builtins.py:6111
3720
3731
msgid "The relation between branch and tree."
3723
#: bzrlib/builtins.py:6080
3734
#: bzrlib/builtins.py:6113
3724
3735
msgid "Reconfigure to be an unbound branch with no working tree."
3727
#: bzrlib/builtins.py:6081
3738
#: bzrlib/builtins.py:6114
3728
3739
msgid "Reconfigure to be an unbound branch with a working tree."
3731
#: bzrlib/builtins.py:6082
3742
#: bzrlib/builtins.py:6115
3732
3743
msgid "Reconfigure to be a bound branch with a working tree."
3735
#: bzrlib/builtins.py:6083
3746
#: bzrlib/builtins.py:6116
3736
3747
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3739
#: bzrlib/builtins.py:6088
3750
#: bzrlib/builtins.py:6121
3740
3751
msgid "Repository type"
3743
#: bzrlib/builtins.py:6089
3754
#: bzrlib/builtins.py:6122
3744
3755
msgid "Location fo the repository."
3747
#: bzrlib/builtins.py:6091
3758
#: bzrlib/builtins.py:6124
3749
3760
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3752
#: bzrlib/builtins.py:6093
3763
#: bzrlib/builtins.py:6126
3753
3764
msgid "Reconfigure to use a shared repository."
3756
#: bzrlib/builtins.py:6097
3767
#: bzrlib/builtins.py:6130
3757
3768
msgid "Trees in Repository"
3760
#: bzrlib/builtins.py:6098
3771
#: bzrlib/builtins.py:6131
3761
3772
msgid "Whether new branches in the repository have trees."
3764
#: bzrlib/builtins.py:6100
3775
#: bzrlib/builtins.py:6133
3766
3777
"Reconfigure repository to create working trees on branches by default."
3769
#: bzrlib/builtins.py:6102
3780
#: bzrlib/builtins.py:6135
3771
3782
"Reconfigure repository to not create working trees on branches by default."
3774
#: bzrlib/builtins.py:6105
3785
#: bzrlib/builtins.py:6138
3775
3786
msgid "Branch to bind checkout to."
3778
#: bzrlib/builtins.py:6107
3789
#: bzrlib/builtins.py:6140
3779
3790
msgid "Perform reconfiguration even if local changes will be lost."
3782
#: bzrlib/builtins.py:6110
3793
#: bzrlib/builtins.py:6143
3783
3794
msgid "Reconfigure a branch to be stacked on another branch."
3786
#: bzrlib/builtins.py:6114
3797
#: bzrlib/builtins.py:6147
3788
3799
"Reconfigure a branch to be unstacked. This may require copying substantial "
3789
3800
"data into it."
3792
#: bzrlib/builtins.py:6124
3803
#: bzrlib/builtins.py:6157
3793
3804
msgid "Can't use both --stacked-on and --unstacked"
3796
#: bzrlib/builtins.py:6138
3807
#: bzrlib/builtins.py:6171
3797
3808
msgid "No target configuration specified"
3800
#: bzrlib/builtins.py:6173
3811
#: bzrlib/builtins.py:6206
3801
3812
msgid "Set the branch of a checkout and update."
3804
#: bzrlib/builtins.py:6175
3815
#: bzrlib/builtins.py:6208
3806
3817
"For lightweight checkouts, this changes the branch being referenced.\n"
3807
3818
"For heavyweight checkouts, this checks that there are no local commits\n"
3880
3891
"want to switch back to your view after that."
3883
#: bzrlib/builtins.py:6272
3894
#: bzrlib/builtins.py:6305
3886
3897
" To define the current view::"
3889
#: bzrlib/builtins.py:6275
3900
#: bzrlib/builtins.py:6308
3890
3901
msgid " bzr view file1 dir1 ..."
3893
#: bzrlib/builtins.py:6277
3904
#: bzrlib/builtins.py:6310
3894
3905
msgid " To list the current view::"
3897
#: bzrlib/builtins.py:6279
3908
#: bzrlib/builtins.py:6312
3898
3909
msgid " bzr view"
3901
#: bzrlib/builtins.py:6281
3912
#: bzrlib/builtins.py:6314
3902
3913
msgid " To delete the current view::"
3905
#: bzrlib/builtins.py:6283
3916
#: bzrlib/builtins.py:6316
3906
3917
msgid " bzr view --delete"
3909
#: bzrlib/builtins.py:6285
3920
#: bzrlib/builtins.py:6318
3910
3921
msgid " To disable the current view without deleting it::"
3913
#: bzrlib/builtins.py:6287
3924
#: bzrlib/builtins.py:6320
3914
3925
msgid " bzr view --switch off"
3917
#: bzrlib/builtins.py:6289
3928
#: bzrlib/builtins.py:6322
3918
3929
msgid " To define a named view and switch to it::"
3921
#: bzrlib/builtins.py:6291
3932
#: bzrlib/builtins.py:6324
3922
3933
msgid " bzr view --name view-name file1 dir1 ..."
3925
#: bzrlib/builtins.py:6293
3936
#: bzrlib/builtins.py:6326
3926
3937
msgid " To list a named view::"
3929
#: bzrlib/builtins.py:6295
3940
#: bzrlib/builtins.py:6328
3930
3941
msgid " bzr view --name view-name"
3933
#: bzrlib/builtins.py:6297
3944
#: bzrlib/builtins.py:6330
3934
3945
msgid " To delete a named view::"
3937
#: bzrlib/builtins.py:6299
3948
#: bzrlib/builtins.py:6332
3938
3949
msgid " bzr view --name view-name --delete"
3941
#: bzrlib/builtins.py:6301
3952
#: bzrlib/builtins.py:6334
3942
3953
msgid " To switch to a named view::"
3945
#: bzrlib/builtins.py:6303
3956
#: bzrlib/builtins.py:6336
3946
3957
msgid " bzr view --switch view-name"
3949
#: bzrlib/builtins.py:6305
3960
#: bzrlib/builtins.py:6338
3950
3961
msgid " To list all views defined::"
3953
#: bzrlib/builtins.py:6307
3964
#: bzrlib/builtins.py:6340
3954
3965
msgid " bzr view --all"
3957
#: bzrlib/builtins.py:6309
3968
#: bzrlib/builtins.py:6342
3958
3969
msgid " To delete all views::"
3961
#: bzrlib/builtins.py:6311
3972
#: bzrlib/builtins.py:6344
3962
3973
msgid " bzr view --delete --all"
3965
#: bzrlib/builtins.py:6318
3976
#: bzrlib/builtins.py:6351
3966
3977
msgid "Apply list or delete action to all views."
3969
#: bzrlib/builtins.py:6321
3980
#: bzrlib/builtins.py:6354
3970
3981
msgid "Delete the view."
3973
#: bzrlib/builtins.py:6324
3984
#: bzrlib/builtins.py:6357
3974
3985
msgid "Name of the view to define, list or delete."
3977
#: bzrlib/builtins.py:6328
3988
#: bzrlib/builtins.py:6361
3978
3989
msgid "Name of the view to switch to."
3981
#: bzrlib/builtins.py:6347
3992
#: bzrlib/builtins.py:6380
3982
3993
msgid "Both --delete and a file list specified"
3985
#: bzrlib/builtins.py:6350
3996
#: bzrlib/builtins.py:6383
3986
3997
msgid "Both --delete and --switch specified"
3989
#: bzrlib/builtins.py:6353
4000
#: bzrlib/builtins.py:6386
3990
4001
msgid "Deleted all views.\n"
3993
#: bzrlib/builtins.py:6355
4004
#: bzrlib/builtins.py:6388
3994
4005
msgid "No current view to delete"
3997
#: bzrlib/builtins.py:6358
4008
#: bzrlib/builtins.py:6391
3998
4009
#, python-format
3999
4010
msgid "Deleted '%s' view.\n"
4002
#: bzrlib/builtins.py:6362
4013
#: bzrlib/builtins.py:6395
4003
4014
msgid "Both --switch and a file list specified"
4006
#: bzrlib/builtins.py:6365
4017
#: bzrlib/builtins.py:6398
4007
4018
msgid "Both --switch and --all specified"
4010
#: bzrlib/builtins.py:6368
4021
#: bzrlib/builtins.py:6401
4011
4022
msgid "No current view to disable"
4014
#: bzrlib/builtins.py:6370
4025
#: bzrlib/builtins.py:6403
4015
4026
#, python-format
4016
4027
msgid "Disabled '%s' view.\n"
4019
#: bzrlib/builtins.py:6374 bzrlib/builtins.py:6396
4030
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4020
4031
msgid "Using '{0}' view: {1}\n"
4023
#: bzrlib/builtins.py:6377
4034
#: bzrlib/builtins.py:6410
4024
4035
msgid "Views defined:\n"
4027
#: bzrlib/builtins.py:6386
4038
#: bzrlib/builtins.py:6419
4028
4039
msgid "No views defined.\n"
4031
#: bzrlib/builtins.py:6393
4042
#: bzrlib/builtins.py:6426
4032
4043
msgid "Cannot change the 'off' pseudo view"
4035
#: bzrlib/builtins.py:6401
4046
#: bzrlib/builtins.py:6434
4036
4047
msgid "No current view.\n"
4039
#: bzrlib/builtins.py:6404
4050
#: bzrlib/builtins.py:6437
4040
4051
msgid "'{0}' view is: {1}\n"
4043
#: bzrlib/builtins.py:6424
4054
#: bzrlib/builtins.py:6457
4044
4055
msgid " <no hooks installed>\n"
4047
#: bzrlib/builtins.py:6428
4058
#: bzrlib/builtins.py:6461
4048
4059
msgid "Remove a branch."
4051
#: bzrlib/builtins.py:6430
4062
#: bzrlib/builtins.py:6463
4053
4064
"This will remove the branch from the specified location but \n"
4054
4065
"will keep any working tree or repository in place."
4057
#: bzrlib/builtins.py:6435
4068
#: bzrlib/builtins.py:6468
4058
4069
msgid " Remove the branch at repo/trunk::"
4061
#: bzrlib/builtins.py:6437
4072
#: bzrlib/builtins.py:6470
4062
4073
msgid " bzr remove-branch repo/trunk"
4065
#: bzrlib/builtins.py:6444
4076
#: bzrlib/builtins.py:6477
4066
4077
msgid "Remove branch even if it is the active branch."
4069
#: bzrlib/builtins.py:6458
4080
#: bzrlib/builtins.py:6491
4070
4081
msgid "Branch is active. Use --force to remove it."
4073
#: bzrlib/builtins.py:6462
4084
#: bzrlib/builtins.py:6495
4074
4085
msgid "Plaintext diff output."
4077
#: bzrlib/builtins.py:6463
4088
#: bzrlib/builtins.py:6496
4078
4089
msgid "Temporarily set aside some changes from the current tree."
4081
#: bzrlib/builtins.py:6465
4092
#: bzrlib/builtins.py:6498
4083
4094
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4084
4095
"ie. out of the way, until a later time when you can bring them back from\n"
4139
#: bzrlib/builtins.py:6504
4150
#: bzrlib/builtins.py:6537
4140
4151
msgid "Shelve all changes."
4143
#: bzrlib/builtins.py:6506
4154
#: bzrlib/builtins.py:6539
4144
4155
msgid "Method to use for writing diffs."
4147
#: bzrlib/builtins.py:6506
4158
#: bzrlib/builtins.py:6539
4151
#: bzrlib/builtins.py:6510
4162
#: bzrlib/builtins.py:6543
4152
4163
msgid "List shelved changes."
4155
#: bzrlib/builtins.py:6512
4166
#: bzrlib/builtins.py:6545
4156
4167
msgid "Destroy removed changes instead of shelving them."
4159
#: bzrlib/builtins.py:6541
4170
#: bzrlib/builtins.py:6574
4160
4171
msgid "No shelved changes."
4163
#: bzrlib/builtins.py:6552
4174
#: bzrlib/builtins.py:6585
4164
4175
msgid "Restore shelved changes."
4167
#: bzrlib/builtins.py:6554
4178
#: bzrlib/builtins.py:6587
4169
4180
"By default, the most recently shelved changes are restored. However if you\n"
4170
4181
"specify a shelf by id those changes will be restored instead. This works\n"
4171
4182
"best when the changes don't depend on each other."
4174
#: bzrlib/builtins.py:6563
4185
#: bzrlib/builtins.py:6596
4175
4186
msgid "The action to perform."
4178
#: bzrlib/builtins.py:6563 bzrlib/conflicts.py:694
4189
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4182
#: bzrlib/builtins.py:6565
4193
#: bzrlib/builtins.py:6598
4183
4194
msgid "Apply changes and remove from the shelf."
4186
#: bzrlib/builtins.py:6566
4197
#: bzrlib/builtins.py:6599
4187
4198
msgid "Show changes, but do not apply or remove them."
4190
#: bzrlib/builtins.py:6567
4201
#: bzrlib/builtins.py:6600
4192
4203
"Instead of unshelving the changes, show the diff that would result from "
4196
#: bzrlib/builtins.py:6569
4207
#: bzrlib/builtins.py:6602
4197
4208
msgid "Delete changes without applying them."
4200
#: bzrlib/builtins.py:6570
4211
#: bzrlib/builtins.py:6603
4201
4212
msgid "Apply changes but don't delete them."
4204
#: bzrlib/builtins.py:6585
4215
#: bzrlib/builtins.py:6618
4205
4216
msgid "Remove unwanted files from working tree."
4208
#: bzrlib/builtins.py:6587
4219
#: bzrlib/builtins.py:6620
4210
4221
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4211
4222
"files are never deleted."
4214
#: bzrlib/builtins.py:6590
4225
#: bzrlib/builtins.py:6623
4216
4227
"Another class is 'detritus', which includes files emitted by bzr during\n"
4217
4228
"normal operations and selftests. (The value of these files decreases with\n"
4221
#: bzrlib/builtins.py:6594
4232
#: bzrlib/builtins.py:6627
4223
4234
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4224
4235
"flags are respected, and may be combined."
4227
#: bzrlib/builtins.py:6597
4238
#: bzrlib/builtins.py:6630
4228
4239
msgid "To check what clean-tree will do, use --dry-run."
4231
#: bzrlib/builtins.py:6600
4242
#: bzrlib/builtins.py:6633
4232
4243
msgid "Delete all ignored files."
4235
#: bzrlib/builtins.py:6601
4246
#: bzrlib/builtins.py:6634
4237
4248
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4240
#: bzrlib/builtins.py:6604
4251
#: bzrlib/builtins.py:6637
4241
4252
msgid "Delete files unknown to bzr (default)."
4244
#: bzrlib/builtins.py:6605
4255
#: bzrlib/builtins.py:6638
4245
4256
msgid "Show files to delete instead of deleting them."
4248
#: bzrlib/builtins.py:6607
4259
#: bzrlib/builtins.py:6640
4249
4260
msgid "Do not prompt before deleting."
9806
9801
"of bzr that requires authentication (smtp for example)."
9809
#: en/help_topics/configuration.txt:379
9804
#: en/help_topics/configuration.txt:391
9811
9806
"The syntax of the file obeys the same rules as the others except for the\n"
9812
9807
"option policies which don't apply."
9815
#: en/help_topics/configuration.txt:382
9810
#: en/help_topics/configuration.txt:394
9817
9812
"For more information on the possible uses of the authentication "
9818
9813
"configuration\n"
9819
9814
"file see :doc:`authentication-help`."
9822
#: en/help_topics/configuration.txt:385
9817
#: en/help_topics/configuration.txt:397
9825
9820
"Common options\n"
9826
9821
"--------------"
9829
#: en/help_topics/configuration.txt:389
9824
#: en/help_topics/configuration.txt:401
9831
9826
"debug_flags\n"
9835
#: en/help_topics/configuration.txt:392
9830
#: en/help_topics/configuration.txt:404
9837
9832
"A comma-separated list of debugging options to turn on. The same values\n"
9838
9833
"can be used as with the -D command-line option (see `help global-options`).\n"
9839
9834
"For example::"
9842
#: en/help_topics/configuration.txt:396
9837
#: en/help_topics/configuration.txt:408
9843
9838
msgid " debug_flags = hpss"
9846
#: en/help_topics/configuration.txt:400
9841
#: en/help_topics/configuration.txt:412
9847
9842
msgid " debug_flags = hpss,evil"
9850
#: en/help_topics/configuration.txt:402
9845
#: en/help_topics/configuration.txt:414
9856
#: en/help_topics/configuration.txt:405
9851
#: en/help_topics/configuration.txt:417
9858
9853
"The email address to use when committing a branch. Typically takes the form\n"
9862
#: en/help_topics/configuration.txt:408
9857
#: en/help_topics/configuration.txt:420
9863
9858
msgid " email = Full Name <account@hostname.tld>"
9866
#: en/help_topics/configuration.txt:410
9861
#: en/help_topics/configuration.txt:422
9872
#: en/help_topics/configuration.txt:413
9867
#: en/help_topics/configuration.txt:425
9874
9869
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9875
9870
"a commit message. This setting is trumped by the environment variable\n"
9963
9958
"to sign newly committed revisions, even if the branch requires signatures."
9966
#: en/help_topics/configuration.txt:462
9961
#: en/help_topics/configuration.txt:474
9968
9963
"dirstate.fdatasync\n"
9969
9964
"~~~~~~~~~~~~~~~~~~"
9972
#: en/help_topics/configuration.txt:465
9967
#: en/help_topics/configuration.txt:477
9974
9969
"If true (default), working tree metadata changes are flushed through the\n"
9975
9970
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9976
9971
"should not be lost if the machine crashes. See also repository.fdatasync."
9979
#: en/help_topics/configuration.txt:469
9974
#: en/help_topics/configuration.txt:481
9981
9976
"gpg_signing_key\n"
9982
9977
"~~~~~~~~~~~~~~~"
9985
#: en/help_topics/configuration.txt:472
9980
#: en/help_topics/configuration.txt:484
9987
9982
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9988
9983
"address, key fingerprint or full key ID. When unset or when set to\n"
9989
9984
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9992
#: en/help_topics/configuration.txt:476
9987
#: en/help_topics/configuration.txt:488
9998
#: en/help_topics/configuration.txt:479
9993
#: en/help_topics/configuration.txt:491
10000
9995
"Only useful in ``locations.conf``. Defines whether or not the\n"
10001
9996
"configuration for this section applies to subdirectories:"
10004
#: en/help_topics/configuration.txt:482
9999
#: en/help_topics/configuration.txt:494
10007
10002
" (default) This section applies to subdirectories as well."
10010
#: en/help_topics/configuration.txt:485
10005
#: en/help_topics/configuration.txt:497
10013
10008
" This section only applies to the branch at this directory and not\n"
10014
10009
" branches below it."
10017
#: en/help_topics/configuration.txt:489
10012
#: en/help_topics/configuration.txt:501
10019
10014
"gpg_signing_command\n"
10020
10015
"~~~~~~~~~~~~~~~~~~~"
10023
#: en/help_topics/configuration.txt:492
10018
#: en/help_topics/configuration.txt:504
10025
10020
"(Default: \"gpg\"). Which program should be used to sign and check "
10026
10021
"revisions.\n"
10027
10022
"For example::"
10030
#: en/help_topics/configuration.txt:495
10025
#: en/help_topics/configuration.txt:507
10031
10026
msgid " gpg_signing_command = /usr/bin/gnpg"
10034
#: en/help_topics/configuration.txt:497
10029
#: en/help_topics/configuration.txt:509
10036
10031
"The specified command must accept the options \"--clearsign\" and \"-u "
10040
#: en/help_topics/configuration.txt:499
10035
#: en/help_topics/configuration.txt:511
10042
10037
"bzr_remote_path\n"
10043
10038
"~~~~~~~~~~~~~~~"
10046
#: en/help_topics/configuration.txt:502
10041
#: en/help_topics/configuration.txt:514
10048
10043
"(Default: \"bzr\"). The path to the command that should be used to run the "
10050
10045
"server for bzr. This value may only be specified in locations.conf, because:"
10053
#: en/help_topics/configuration.txt:505
10048
#: en/help_topics/configuration.txt:517
10055
10050
"- it's needed before branch.conf is accessible\n"
10056
10051
"- allowing remote branch.conf files to specify commands would be a security\n"
10060
#: en/help_topics/configuration.txt:509
10055
#: en/help_topics/configuration.txt:521
10061
10056
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10064
#: en/help_topics/configuration.txt:511
10059
#: en/help_topics/configuration.txt:523
10066
10061
"smtp_server\n"
10067
10062
"~~~~~~~~~~~"
10070
#: en/help_topics/configuration.txt:514
10065
#: en/help_topics/configuration.txt:526
10072
10067
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10073
10068
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10076
#: en/help_topics/configuration.txt:517
10071
#: en/help_topics/configuration.txt:529
10078
10073
"smtp_username, smtp_password\n"
10079
10074
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10082
#: en/help_topics/configuration.txt:520
10077
#: en/help_topics/configuration.txt:532
10084
10079
"User and password to authenticate to the SMTP server. If smtp_username\n"
10085
10080
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10288
10283
"--remember``."
10291
#: en/help_topics/configuration.txt:634
10286
#: en/help_topics/configuration.txt:646
10293
10288
"push_location\n"
10294
10289
"~~~~~~~~~~~~~"
10297
#: en/help_topics/configuration.txt:637
10292
#: en/help_topics/configuration.txt:649
10299
10294
"If present, the location of the default branch for push. This option\n"
10300
10295
"is normally set by the first ``push`` or ``push --remember``."
10303
#: en/help_topics/configuration.txt:640
10298
#: en/help_topics/configuration.txt:652
10305
10300
"push_strict\n"
10306
10301
"~~~~~~~~~~~"
10309
#: en/help_topics/configuration.txt:643
10304
#: en/help_topics/configuration.txt:655
10311
10306
"If present, defines the ``--strict`` option default value for checking\n"
10312
10307
"uncommitted changes before pushing."
10315
#: en/help_topics/configuration.txt:646
10310
#: en/help_topics/configuration.txt:658
10317
10312
"dpush_strict\n"
10318
10313
"~~~~~~~~~~~~"
10321
#: en/help_topics/configuration.txt:649
10316
#: en/help_topics/configuration.txt:661
10323
10318
"If present, defines the ``--strict`` option default value for checking\n"
10324
10319
"uncommitted changes before pushing into a different VCS without any\n"
10325
10320
"custom bzr metadata."
10328
#: en/help_topics/configuration.txt:653
10323
#: en/help_topics/configuration.txt:665
10330
10325
"bound_location\n"
10331
10326
"~~~~~~~~~~~~~~"
10334
#: en/help_topics/configuration.txt:656
10329
#: en/help_topics/configuration.txt:668
10336
10331
"The location that commits should go to when acting as a checkout.\n"
10337
10332
"This option is normally set by ``bind``."
10340
#: en/help_topics/configuration.txt:659
10335
#: en/help_topics/configuration.txt:671
10346
#: en/help_topics/configuration.txt:662
10341
#: en/help_topics/configuration.txt:674
10348
10343
"If set to \"True\", the branch should act as a checkout, and push each "
10349
10344
"commit to\n"
10350
10345
"the bound_location. This option is normally set by ``bind``/``unbind``."
10353
#: en/help_topics/configuration.txt:665
10348
#: en/help_topics/configuration.txt:677
10355
10350
"send_strict\n"
10356
10351
"~~~~~~~~~~~"
10359
#: en/help_topics/configuration.txt:668
10354
#: en/help_topics/configuration.txt:680
10361
10356
"If present, defines the ``--strict`` option default value for checking\n"
10362
10357
"uncommitted changes before sending a merge directive."
10365
#: en/help_topics/configuration.txt:671
10360
#: en/help_topics/configuration.txt:683
10367
10362
"add.maximum_file_size\n"
10368
10363
"~~~~~~~~~~~~~~~~~~~~~"
10371
#: en/help_topics/configuration.txt:674
10366
#: en/help_topics/configuration.txt:686
10373
10368
"Defines the maximum file size the command line \"add\" operation will allow\n"
10374
10369
"in recursive mode, with files larger than this value being skipped. You may "