-=[ Mr. Bumblebee ]=-
_Indonesia_
Þ• J l ¼$ 1 ~ 1 ˆ1 š1 ¸1 + Í1 ù1 % 2 <2 o R2 Â2 Ó2 ) î2 ¯ 3 È3 Ý3 õ3
4 "4 % >4 d4 z4 # ”4 ¸4 Õ4 ×5 ! ò5 6 46 A R6 & ”6 " »6 Þ6 y û6 u7 ’7 ' ¦7 Î7 ( ë7 9 8 N8 1 n8 8 < »8 T ø9 ¨ M; * ö; !< ( A< ( j< A “< 2 Õ< 8 = / A= - q= ; Ÿ= ; Û= + > C> ‰ ä> < n? «? Ç? - â? ' @ = 8@ > v@ < µ@ l ò@ A _A 8 ¡A ` ÚA C ;B E B ! ÅB K çB O 3C ƒC ¡C ®C ¾C ÏC äC _ D w eD f ÝD ? DE F „E ‡ ËE ž SF ( òG 8 I : TI » I E KJ « ‘J B =K ‚ €L
M § N ¨ ¶N Z _O ½ ºP _ xQ ØQ ³ èQ ¤ œR o AS © ±S M [T ƒ ©U P -V ê ~V iW ™ uX ö Y ‚ Z F ‰[ é Ð[ ² º\ ò m] ¨ `^ m _ & w_ @ ž_ ß_ ` E ` Y` ’ c` S ö` ( Ja I sa ½a J Øa 5 #b 8 Yb ³ ’b { Fd A Âd . e % 3e 6 Ye e ™e
ªe A µe . ÷e — &f ) ¾f 3 èf P g 8 mg ] ¦g c h hh {h h žh ¯h Äh Øh éh ùh
i i ` ´j # k ì 9k é &l ' m ™ 8m f Òn 6 9o 4 po I ¥o t ïo dp lp + ‰p µp , Õp C q ò Fr ! 9s N [s
ªs K ¸s J t J Ot št ·t , Òt B ÿt Bu E \u “ ¢u 6v š Æv ã aw + Ex qx $ Žx 9 ³x : íx . (y 2 Wy 6 Šy 8 Áy # úy # z C Bz & †z . z 6 Üz ` { ) t{ ) ž{ ' È{ K ð{ <| M \| ' ª| ' Ò| 9 ú| , 4} ! a} ? ƒ} Ã} Q S~ £ ¥~ F I + Ù ‰ ò + |€ ) ¨€ Ò€ ä€ ) % * O z – Q ° ‚ / ‚ - J‚ ( x‚ 0 ¡‚ & Ò‚ 2 ù‚ ,ƒ D Hƒ 2 ƒ Àƒ Ûƒ ‹ ö„ 5 ‚… F ¸… & ÿ… G &† 7 n† 6 ¦† : ݆ $ ‡ ' =‡ y e‡ p ߇ Å Pˆ ! ‰ 0 8‰ , i‰ ø –‰ . Š F ¾‹ Û [ á ¬ =Ž † êŽ [ q õ Í f Ñ 7 *’ E b’ œ ¨’ Ô E“ w ” ‹ ’• — ¤ ˜ ¬ E™ Ë ò™ b ¾š !› á 3œ w šž ªŸ Ú À õ ›¡ Ñ ‘£ © c¤ l
¥ # z¦ ' ž¦ ® Ʀ ¬ u§ • "© Í ¸© - †ª ~ ´ª 2 3« 9 f« B « 7 ã« * ¬ U F¬ < œ¬ , Ù¬ 6 ! 4 X © ) É V ó A J® ; Œ® _ È® R (¯ {¯ 7 ’¯ + ʯ 4 ö¯ " +° F N° •° ø ¬° & ¥± q ̱ # >² b² ! u² —² $ ±² $ Ö² b û² Ä ^³ #´ – =´ ] Ô´ F 2¶ U y¶ œ ϶ l· 4 {· $ °· ! Õ· ) ÷· 1 !¸ S¸ # n¸ Œ ’¸ o ¹ ¹ 0 ®¹ 2 ß¹ p º Ì ƒº ä P» € 5¼ Z ¶¼ ½ ,½ A½ ! `½ / ‚½ ²½ ǽ Þ½ & ø½ # ¾ C¾ Q `¾
²¾ @ À¾ d ¿ f¿ 8 ƒ¿ ¼¿ . ο F ý¿ 5 DÀ ; zÀ ¶À ÈÀ : èÀ < #Á 8 `Á ™Á ®Á $ ÅÁ @ êÁ + 8 I T ‚ b × < :à wà % –à . ¼Ã ëà D Ä NÄ $ oÄ ”Ä + °Ä ÜÄ 7 ÷Ä < /Å ? lÅ ¬Å ÍÅ + ìÅ Æ 3 1Æ 0 eÆ 7 –Æ 5 ÎÆ 6 Ç ;Ç WÇ 6 uÇ ¬Ç ÌÇ 8 áÇ 2 È d MÈ R ²È R É 5 XÉ I ŽÉ ? ØÉ Ê < /Ê # lÊ % Ê ( ¶Ê ¯ ßÊ ³ Ë ³ CÌ @ ÷Ì E 8Í # ~Í " ¢Í a ÅÍ ' 'Ï & OÏ Ì vÏ CÐ , bÐ µ Ð J EÑ Ñ Ñ ? bÓ ‡ ¢Ó ‘ *Ô ¼Ô q >Õ T °Õ J Ö A PÖ " ’Ö Ê µÖ q €× p ò× Û cØ N ?Ù d ŽÙ 8 óÙ @ ,Ú h mÚ ¯ ÖÛ c †Ü Æ êÜ i ±Ý ˆ Þ 2 ¤Þ Ì ×Þ q ¤ß ê à b á Ç dá ‰ ,â ¶â 0 Ìâ 1 ýâ /ã 1 Jã $ |ã
¡ã ¬ã Êã ( êã % ä ? 9ä B yä G ¼ä å " !å ½ Då L æ Oæ ! pæ ’æ °æ K Íæ ç .ç § 0è 8 Øè j é Ò |é _ Oê C ¯ê è óë Üì G øì 4 @í m uí > ãí 3 "î # Vî ” zî 2 ð m Bð I °ð úð _ ñ 7 dñ * œñ : Çñ . ò 7 1ò @ iò B ªò 0 íò C ó bó ( ~ó §ó ! Åó çó = öó 4ô Pô jô J ô è Ìô µõ I Ðõ ÷ #÷ 9÷ : B÷ }÷ ? ÷ ) Ý÷ @ ø ^ Hø ¢ §ø ê Jù _ 5ú + •ú B Áú Š û = û ¼ Íû i Šü $ ôü " ý <ý ½ \ý º ÿ Õÿ çÿ + F % c ‰ Ÿ 0 ) K Ó u I ^ v ‹ £ 3 ¿ ó # # G ? d ¤ ! ¿ á A & a " ˆ « y È B _ ' s › ( ¸ 9 á 1 ; m Ä ˆ u M Ê Ã
+ Ž 1 º ? ì C , T p B Å ?
N H
A —
P Ù
. * E Y å Ÿ Š … Z . k $ š : ¿ F ú U A N — R æ l 9 H ¦ I ï € 9 a º e . ‚ N ± O P n { ‹ œ ± _ Ò 2 u à c 9 o
¢ » ì ^ V K S ¢ Ô ö T Ë
¦ . ¼ Õ X ’! Ý ë" ò É# ˆ ¼$ E& i ]' Ç' ×' Á ì( ®) Ó <* È + À Ù, b š- n ý- < l/ Ö ©0 €1 !3 _ 85 F ˜5 ë ß6 n Ë7 ö :9 w 1: & ©: Q Ð: $ "; * G; _ r; Ò; Õ ä; º< C := w ~= 9 ö= € 0> K ±> d ý> i b? ¤ ÌA c qB 7 ÕB R
C f `C ÇC ÖC èC K îC 8 :D Å sD 9 9E @ sE Z ´E R F j bF ³ ÍF G # ¢G ÆG äG ) H /H JH YH iH yH # ‰H i J E K ]K . íL > N f [N v ÂP E 9Q i Q r éQ š \R ÷R ' þR E &S 9 lS ? ¦S Š æS h qU E ÚV © W ÊW Z éW C DX ^ ˆX 1 çX 1 Y 5 KY r Y ôY c Z ü xZ ÿ u[ Ç u\ - =] E k^ = ±^ E ï^ M 5_ p ƒ_ e ô_ N Z` Q ©` Q û` 9 Ma 9 ‡a r Áa 0 4b R eb W ¸b | c > c 6 Ìc 3 d W 7d - d b ½d ? e 9 `e Q še K ìe E 8f ` ~f ½ ßf f g à h N Èh 4 i E Li 2 ’i ¼ Åi H ‚j N Ëj k $ *k Ok + fk 9 ’k 9 Ìk 1 l * 8l e cl 3 Él H ýl 3 Fm H zm 3 Ãm K ÷m Z Cn ? žn f Þn ? Eo - …o Í ³o À q A Br ‡ „r T s ] as F ¿s Q t C Xt ( œt K Åt œ u - ®u 3 Üv ? x > Px ? x , Ïx µ üy ¨ ²{ 0 [} o Œ~ ò ü~ Î ï Ø ¾€ k —‚ s „ ] w„ r Õ„  H… G † ñ S‡ ã E‰ Ü )‹ Ô + Û õ ¸ ý ˜ ¶ ÿ O’ ‡ O“ ë ד ç Õ ê «— V –™ m íš [ ä qž ý VŸ ? T¡ J ”¡ ü ß¡ É Ü¢ Ý ¦¥ „¦ [ ™§ » õ§ 7 ±¨ G é¨ 9 1© I k© . µ© ~ ä© z cª V Þª A 5« ] w« ] Õ« E 3¬ 8 y¬ Q ²¬ t \ y ` Ö ~ 7® ` ¶® 9 ¯ ] Q¯ 6 ¯¯ R æ¯ P 9° i Š° @ ô° h 5± 9 ž² ¹ ز < ’³ 3 ϳ H ´ ? L´ 7 Œ´ C Ä´ µ ( ™µ 0 ¶ / ó¶ “ #¸ v ·¹ ” .º µ ú * y» 3 ¤» 8 Ø» - ¼ Q ?¼ K ‘¼ K ݼ F )½ ù p½ ‚ j¾ & í¾ O ¿ ^ d¿ Ž ÿ ù RÀ u LÁ É Â | ŒÃ " Ä 0 ,Ä * ]Ä E ˆÄ B ÎÄ < Å ? NÅ 2 ŽÅ D ÁÅ ? Æ 6 FÆ Q }Æ $ ÏÆ r ôÆ › gÇ 6 È W :È $ ’È I ·È ~ É [ €É e ÜÉ ! BÊ - dÊ E ’Ê Z ØÊ K 3Ë Ë —Ë < ±Ë S îË 6 BÌ P yÌ ~ ÊÌ § IÍ Z ñÍ < LÎ H ‰Î 9 ÒÎ 3 Ï T @Ï •Ï < ±Ï * îÏ M Ð 3 gÐ T ›Ð N ðÐ U ?Ñ A •Ñ 7 ×Ñ M Ò / ]Ò N Ò W ÜÒ T 4Ó H ‰Ó H ÒÓ < Ô < XÔ l •Ô 0 Õ - 3Õ Q aÕ K ³Õ — ÿÕ —Ö „ %× \ ª× o Ø x wØ 1 ðØ = "Ù E `Ù < ¦Ù ? ãÙ Î #Ú é òÚ é ÜÛ L ÆÜ … Ý = ™Ý 0 ×Ý ø Þ 0 à / 2à Õ bà 8á C Wá Ú ›á p vâ çâ K å Ç Nå ä æ ° ûæ ¦ ¬ç „ Sè { Øè ` Té F µé 0 üé ¬ -ë ’ Úë ; mì c ©í —
î E ¥î ` ëî L Lï Ý ™ñ ö wò Ú nó ˆ Iô ± Òô R „õ ×õ ¡ Ýö V ÷ ¨ Öø ù Ç ’ú * Zû O …û B Õû - ü J Fü C ‘ü Õü F ëü 3 2ý ? fý C ¦ý r êý x ]þ i Öþ 3 @ÿ 0 tÿ ¥ÿ ˆ · ; @ 9 | > ¶ 2 õ i ( 6 ’ k É é 5 G – g 7 þ ˆ 6 ¿ z Å ' @ ] h [ Æ ¯ " Z Ò H -
. v
. ¥
O Ô ‡ $ ¬ : ¨ Z Q > U \ ” ` ñ K R _ ž T þ Q S s ¥ 0 E J : ? Ë ` ( ‰ % © * Ï | ú = w 2 µ ƒ è l - ¯ ^ ¼ + ] G B ¥ m è x V ß Ï ¯ e Î < 4 x q ¨ ê f “ ß ú Ú! 5 \" ? ’" % Ò" ° ð Î š l G € î û ? × Ÿ 0 ™ v Ö ô ) | ù º Õ ¡ q ‘
D N Ï - : " 6 Ø ¤ ¬ X ; Ú ç # ½ · / … ù F ß D „ ¹ _ & E Q c ‚ ¾ ß Œ æ À L 9 } r { z f ÿ É Ñ
3 ž ô œ 8 · ð í @ 4 6 Ð ‰ A V à ¡ F â 7 Þ a B ¦ Ê ~ Z Q P Ä 2 u 3 Ô ¯ _ i ` ) $  U ’ £ ó à õ + ! Ç Š – ü J [ | ÷ ± Ë * £ É Ú + , “ 7 Û ¶ J Í ’ å F + • Ü ( h J ú G S • ¸ ¤ ' Ø í x ” > á " – ( « a Ö ; ç 5 5 ÿ Ó » ^ . Ó Ç á < ì s ) Î , H
— t # ˜ ? À \ ¢ Ê u ” ] ¯ ‚ ã Ã ´ † « ø R ñ Û 4 È ò ¸ † Ï þ 6 n 1 ³ G % î I ; W ö Ò O Ò µ } ü . Å 1 ï Ž ã è = i ¥ ™ K ¨ Ù ¦ A g ± þ ý
: = ] ! ‘ @ D æ Õ Å ë j é ! > ‹ % — ( ª § ž ê T m ‹ å ˜ µ " - q U b h ‰ [ × Z œ 8  y o Á ï w . Y ® ì K d ò - ¼ © s X è N S * A o \ ø < v I ` ˆ C Y b Ë ƒ › Æ d ² “ ¹ ‡ › š È T ³ Š Œ $ ¿ â „ k
n à e Þ ÷ 4 9 # ´ » ó Æ ˆ ~ / ¨ O C Ä 5 % ¥ € 7 R Ÿ @ p & k P 2 ¢ x g ä © f ª w é j = ê & Ð y Ì ½ Ô ¼ W Á Ý ¬ Ý e { ¿ ' V M º ^ 9 B > c 2 õ / H ƒ ° m B ¾ ö C t ® 3 M 8 < Ñ ‡ H I § l Ù : z Í Ž ú ä 1 r 0 E ? L ² 0 $ p
… û ë E Ü , * ñ ' ¶ Ì ý
To commit to master branch, run update and then commit.
You can also pass --local to commit to continue working disconnected. bzr alias bzr alias --remove ll bzr alias ll bzr alias ll="log --line -r-10..-1" bzr check --repo bar bzr check --tree --branch foo bzr check baz bzr checkout --lightweight repo/trunk trunk-checkout
cd trunk-checkout
(add files here) bzr diff bzr diff --old xxx bzr diff --old xxx --new yyy NEWS bzr diff --prefix old/:new/
Show the differences using a custom diff program with options::
bzr diff --using /usr/bin/diff --diff-options -wu bzr diff -c2 bzr diff -r-2.. bzr diff -r1 bzr diff -r1..3 bzr diff -r1..3 xxx bzr diff -r<chosen_parent>..X bzr diff NEWS bzr diff xxx/NEWS bzr ignore "!special.class" bzr ignore "*.class" bzr ignore "RE:(?!debian/).*"
Ignore everything except the "local" toplevel directory,
but always ignore autosave files ending in ~, even under local/::
bzr ignore "*"
bzr ignore "!./local"
bzr ignore "!!*~" bzr ignore "RE:^#" bzr ignore "RE:lib/.*\.o" bzr ignore "lib/**/*.o" bzr ignore ./Makefile bzr init-repo --no-trees repo
bzr init repo/trunk bzr merge -r 81..82 ../bzr.dev bzr merge -r 82 ../bzr.dev bzr merge ../bzr.dev bzr merge ../feature1a
bzr merge ../feature1b --force
bzr commit -m 'revision with three parents' bzr merge /tmp/merge bzr missing bzr missing --my-revision ..-10 bzr missing -r ..-10 bzr missing http://server/branch bzr remerge --merge-type weave --reprocess foobar bzr remerge --show-base bzr whoami "Frank Chu <fchu@example.com>" bzr whoami --email -l N display a maximum of N revisions
-n N display N levels of revisions (0 for all, 1 for collapsed)
-v display a status summary (delta) for each revision
-p display a diff (patch) for each revision
--show-ids display revision-ids (and file-ids), not just revnos -r-1 show just the tip
-r-10.. show the last 10 mainline revisions
-rsubmit:.. show what's new on this branch
-rancestor:path.. show changes since the common ancestor of this
branch and the one at location path
-rdate:yesterday.. show changes since yesterday -rX display revision X
-rX.. display revision X and later
-r..Y display up to and including revision Y
-rX..Y display from X to Y inclusive ...but do not ignore "special.class":: Check everything at 'baz':: Check only the repository at 'bar':: Check the tree and branch at 'foo':: Difference between revision 3 and revision 1 for branch xxx:: Difference between revision 3 and revision 1:: Difference between the working tree and revision 1:: Ignore .class files in all directories...:: Ignore .o files under the lib directory:: Ignore everything but the "debian" toplevel directory:: Ignore files whose name begins with the "#" character:: Make a lightweight checkout elsewhere:: Note that in the case of a merge, the -c option shows the changes
compared to the left hand parent. To see the changes against
another parent, use:: Re-do the merge of "foobar", using the weave merge algorithm, with
additional processing to reduce the size of conflict regions:: Same as 'bzr diff' but prefix paths with old/ and new/:: Set an alias for 'll':: Set the current user:: Show just the differences for file NEWS:: Show the alias specified for 'll':: Show the differences between two branches for file NEWS:: Show the differences from branch xxx to this working tree: Show the differences in working tree xxx for file NEWS:: The changes between the current revision and the previous revision
(equivalent to -c-1 and -r-2..-1) The changes introduced by revision 2 (equivalent to -r1..2):: To apply a merge directive contained in /tmp/merge:: To create a merge revision with three parents from two branches
feature1a and feature1b: To merge changes up to and including revision 82 from bzr.dev:: To merge the changes introduced by 82, without previous changes:: To remove an alias for 'll':: To see the changes introduced by revision X::
bzr diff -cX [ALIASES]
tip = log -r-1
top = log -l10 --line
show = log -v -p bzr commit foo -x foo/bar bzr info bzr info -v bzr info -vv bzr ls --ignored bzr mv SOURCE... DESTINATION cd ~/project
bzr init
bzr add .
bzr status
bzr commit -m "imported project" * ``bzr log -r2 -p guide.txt`` will display an error message as there
was no file called guide.txt in revision 2. * ``bzr log -r2 -p tutorial.txt`` will show the changes made to
the original file in revision 2. * ``bzr log guide.txt`` will log the file added in revision 1 * ``bzr log tutorial.txt`` will log the new file added in revision 3 * revision 1: add tutorial.txt
* revision 2: modify tutorial.txt
* revision 3: rename tutorial.txt to guide.txt; add tutorial.txt ================= =========================
Supported formats Autodetected by extension
================= =========================
dir (none)
tar .tar
tbz2 .tar.bz2, .tbz2
tgz .tar.gz, .tgz
zip .zip
================= ========================= A common mistake is to forget to add a new file or directory before
running the commit command. The --strict option checks for unknown
files and aborts the commit if any are found. More advanced pre-commit
checks can be implemented by defining hooks. See ``bzr help hooks``
for details. A selective commit after a merge is not yet supported. Display information on the format and related locations: Display the above together with extended format information and
basic statistics (like the number of files in the working tree and
number of revisions in the branch and repository): Display the above together with number of committers to the branch: Filenames are interpreted within their historical context. To log a
deleted file, specify a revision range so that the file existed at
the end or start of the range. GUI tools and IDEs are often better at exploring history than command
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
<http://wiki.bazaar.canonical.com/IDEIntegration>. Historical context is also important when interpreting pathnames of
renamed files/directories. Consider the following example: Hooks can also be configured to run after a commit. This allows you
to trigger updates to external systems like bug trackers. The --fixes
option can be used to record the association between a revision and
one or more bugs. See ``bzr help bugs`` for details. If parameters are given and the first one is not a branch, the log
will be filtered to show only those revisions that changed the
nominated files or directories. If selected files are specified, only changes to those files are
committed. If a directory is specified then the directory and
everything within it is committed. If the author of the change is not the same person as the committer,
you can specify the author's name using the --author option. The
name should be in the same format as a committer-id, e.g.
"John Doe <jdoe@example.com>". If there is more than one author of
the change you can specify the option multiple times, once for each
author. If you accidentially commit the wrong changes or make a spelling
mistake in the commit message say, you can use the uncommit command
to undo it. See ``bzr help uncommit`` for details. If you are interested in looking deeper into a particular merge X,
use ``bzr log -n0 -rX``. In this case: Note that the default number of levels to display is a function of the
log format. If the -n option is not used, the standard log formats show
just the top level (mainline). Renames are always followed by log. By design, there is no need to
explicitly ask for this (and no way to stop logging a file back
until it was last renamed). See ``bzr help revisionspec`` for details on how to specify X and Y.
Some common examples are given below:: Status summaries are shown using status flags like A, M, etc. To see
the changes explained using words like ``added`` and ``modified``
instead, use the -vv option. The --match option can be used for finding revisions that match a
regular expression in a commit message, committer, author or bug.
Specifying the option several times will match any of the supplied
expressions. --match-author, --match-bugs, --match-committer and
--match-message can be used to only match a specific field. The -r option can be used to specify what revision or range of revisions
to filter against. The various forms are shown below:: The following options can be used to control what information is
displayed:: The log format controls how information about each revision is
displayed. The standard log formats are called ``long``, ``short``
and ``line``. The default is long. See ``bzr help log-formats``
for more details on log formats. To display revisions from oldest to newest, use the --forward option.
In most cases, using this option will have little impact on the total
time taken to produce a log, though --forward does not incrementally
display revisions like --reverse does when it can. When excludes are given, they take precedence over selected files.
For example, to commit only changes within foo, but not changes
within foo/bar:: When exploring non-mainline history on large projects with deep
history, the performance of log can be greatly improved by installing
the historycache plugin. This plugin buffers historical information
trading disk space for faster speed. When logging a range of revisions using -rX..Y, log starts at
revision Y and searches back in history through the primary
("left-hand") parents until it finds X. When logging just the
top level (using -n1), an error is reported if X is not found
along the way. If multi-level logging is used (-n0), X may be
a nested merge revision and the log will be truncated accordingly. You may find it useful to add the aliases below to ``bazaar.conf``:: ``bzr log -v`` on a branch with lots of history is currently
very slow. A fix for this issue is currently under development.
With or without that fix, it is recommended that a revision range
be given when using the -v option. ``bzr tip`` will then show the latest revision while ``bzr top``
will show the last 10 mainline revisions. To see the details of a
particular revision X, ``bzr show -rX``. bzr has a generic full-text matching plugin, bzr-search, that can be
used to find revisions matching user names, commit messages, etc.
Among other features, this plugin can find all revisions containing
a list of words but not others. bzr log log the current branch
bzr log foo.py log a file in its branch
bzr log http://server/branch log a branch on a server "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
produces patches suitable for "patch -p1". %(msg)s %(host)s%(port)s%(orig_error)s %(username)r does not seem to contain a reasonable email address %d tag updated. %d tags updated. %s
Commit refused. (The --force option is deprecated, rather use --no-backup in future.) (default) * Ignore patterns starting with "#" act as comments in the ignore file.
To ignore patterns that begin with that character, use the "RE:" prefix. , the header appears corrupt, try passing -r -1 to set the state to the last commit --after cannot be specified with --auto. --benchmark is no longer supported from bzr 2.2; use bzr-usertest instead --dry-run requires --auto. --dry-run will show which files would be added, but not actually
add them. --email can only be used to display existing identity --exclude-common-ancestry requires -r with two revisions --file-ids-from will try to use the file ids from the supplied path.
It looks up ids trying to find a matching parent directory with the
same filename, and then by pure path. This option is rarely needed
but can be useful when adding the same logical file into two
branches that will be merged later (without showing the two different
adds as a conflict). It is also useful when merging another project
into a subdirectory of this one. --help, -h Show help message.
--verbose, -v Display more information.
--quiet, -q Only display errors and warnings. --prefix expects two values separated by a colon (eg "old/:new/") --tree and --revision can not be used together --uncommitted requires a working tree --verbose shows the path where each plugin is located. :Checks: :Custom authors: :Examples: :Examples:
Create a shared repository holding just branches:: :Examples:
Ignore the top level Makefile:: :Examples:
Re-do the merge of all conflicted files, and show the base text in
conflict regions, in addition to the usual THIS and OTHER texts:: :Examples:
Show the current aliases:: :Examples:
Show the email of the current user:: :Examples:
Shows the difference in the working tree versus the last commit:: :Examples:
To merge all new revisions from bzr.dev:: :Exit values:
1 - changed
2 - unrepresentable changes
3 - error
0 - no change :Notes:
* Ignore patterns containing shell wildcards must be quoted from
the shell on Unix. :Ordering control: :Other filtering: :Output control: :Path filtering: :Revision filtering: :Selective commits: :Things to note: :Tips & tricks: :Usage:
%s
:Usage: %s
A backup.bzr.~#~ directory is created at the start of the conversion
process (where # is a number). By default, this is left there on
completion. If the conversion fails, delete the new .bzr directory
and rename this one back in its place. Use the --clean option to ask
for the backup.bzr directory to be removed on successful conversion.
Alternatively, you can delete it by hand if everything looks good
afterwards. A warning will be printed when nested trees are encountered,
unless they are explicitly ignored. Add specified files or directories. Adding a file whose parent directory is not versioned will
implicitly add the parent, and so on up to the root. This means
you should never need to explicitly add a directory, they'll just
get added when you add a file in the directory. Additionally for directories, symlinks and files with a changed
executable bit, Bazaar indicates their type using a trailing
character: '/', '@' or '*' respectively. These decorations can be
disabled using the '--no-classify' option. Alternatively, to list just the files:: An explanatory message needs to be given for each commit. This is
often done by using the --message option (getting the message from the
command line) or by using the --file option (getting the message from
a file). If neither of these options is given, an editor is opened for
the user to enter the message. To see the changed files in the
boilerplate text loaded into the editor, use the --show-diff option. Any files matching patterns in the ignore list will not be added
unless they are explicitly mentioned. Apply content filters to display the convenience form. Apply content filters to export the convenient form. Apply uncommitted changes from a working copy, instead of branch changes. At the same time it is run it may recompress data resulting in
a potential saving in disk space or performance gain. Authors Automatically guess renames. Avoid making changes when guessing renames. Backup changed files (default). Bad value "%(value)s" for option "%(name)s". Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
the global ignore file can be found in the application data directory as
C:\Documents and Settings\<user>\Application Data\Bazaar\2.0\ignore.
Global ignores are not touched by this command. The global ignore file
can be edited directly using an editor. Before merges are committed, the pending merge tip revisions are
shown. To see all pending merge revisions, use the -v option.
To skip the display of pending merge information altogether, use
the no-pending option or specify a file/directory. Bind new branch to from location. Bound branches use the nickname of its master branch unless it is set
locally. Branch format Branch to merge into, rather than the one containing the working directory. Branch to pull into, rather than the one containing the working directory. Branch to push from, rather than the one containing the working directory. Branch/tree to compare from. Branch/tree to compare to. Branched %d revision. Branched %d revisions. Branches and working trees will also report any missing revisions. Branches are up to date.
Branches in the repository will default to not having a working tree. By default branch will fail if the target directory exists, but does not already have a control directory. This flag will allow branch to proceed. By default push will fail if the target directory exists, but does not already have a control directory. This flag will allow push to proceed. By default, the entire tree is committed and the person doing the
commit is assumed to be the author. These defaults can be overridden
as explained below. By default, this command only works on branches that have not diverged.
Branches are considered diverged if the destination branch's most recent
commit is one that has not been merged (directly or indirectly) into the
parent. Cannot do conflict reduction and show base. Cannot pull individual files Cannot set both --verbose and --null Cannot use --uncommitted and --revision at the same time. Cannot use --uncommitted with bundles or merge directives. Cannot use -r with merge directives or bundles Check the branch related to the current directory. Check the repository related to the current directory. Check the working tree related to the current directory. Commit changes into a new revision. Commit even if nothing has changed. Commit refused because there are unknown files in the working tree. Compress the data within a repository. Config file %(filename)s is not UTF-8 encoded
Conflict reduction is not supported for merge type %s. Conflicts detected in working tree. Use "bzr conflicts" to list, "bzr resolve FILE" to resolve. Connection Timeout: %(msg)s%(orig_error)s Connection closed: %(msg)s %(orig_error)s Could not determine branch to refer to. Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s Could not parse --commit-time: Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s Create a branch without a working tree. Create a branch without a working-tree. Create a new branch that is a copy of an existing branch. Create a new checkout of an existing branch. Create a new versioned directory. Create a shared repository for branches to share storage space. Create a stacked branch referring to the source branch. The new branch will depend on the availability of the source branch for all operations. Create a stacked branch that references the public location of the parent branch. Create a stacked branch that refers to another branch for the commit history. Only the work not present in the referenced branch is included in the branch created. Create the path leading up to the branch if it does not already exist. Created a {0} (format: {1})
Created new stacked branch referring to %s. Cycle in graph %(graph)r Delete all the specified files, even if they can not be recovered and even if they are non-empty directories. (deprecated, use no-backup) Delete from bzr but leave the working copy. Delete obsolete packs to save disk space. Deletion Strategy Description of the new revision. Diff format Diff format to use. Display changes in the local branch only. Display changes in the remote branch only. Display email address only. Display more information. Display only the revisions that are not part of both ancestries (require -rX..Y). Display status summary. Display the default ignore rules that bzr uses. Do not consider changes made to a given path. Do not mark object type using indicator. Do not report commits with more than one parent. Do not save backups of reverted files. Do not use a shared repository, even if available. Don't backup changed files. Don't populate the working tree, even for protocols that support it. Don't recursively add the contents of directories. Don't show pending merges. During the pack operation, bazaar takes a backup of existing repository
data, i.e. pack files. This backup is eventually removed by bazaar
automatically when it is safe to do so. To save disk space by removing
the backed up pack files, the --clean-obsolete-packs option may be
used. Empty commit message specified. Please specify a commit message with either --message or --file or leave a blank message with --message "". Error(s) parsing config file %(filename)s:
%(errors)s Export current or past revision to a destination directory or archive. Export format %(format)r not supported Export the working tree contents rather than that of the last revision. Failed to GPG sign data with command "%(command_line)s" Failed to rename %(from_path)s to %(to_path)s: %(why)s Failed to verify GPG signature data with error "%(error)s" File %(filename)s is not conflicted. Files cannot be moved between branches. For more information on upgrades, see the Bazaar Upgrade Guide,
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/. Format for the bzr 2.0 series.
Uses group-compress storage.
Provides rich roots which are a one-way transition.
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
given, try to find the format with the extension. If no extension
is found exports to a directory (equivalent to --format=dir). Get file contents from this tree. HTTP MIME Boundary missing for %(path)s: %(msg)s Hard-link working tree files where possible. If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
the branch found in '.'. This is useful if you have removed the working tree
or if it was never created - i.e. if you pushed the branch to its current
location using SFTP. If OLDNAME does not exist on the filesystem but is versioned and
NEWNAME does exist on the filesystem but is not versioned, mv
assumes that the file has been manually moved and only updates
its internal inventory to reflect that change.
The same is valid when moving many SOURCE files to a DESTINATION. If a .bzrignore file does not exist, the ignore command
will create one and add the specified files or patterns to the newly
created file. The ignore command will also automatically add the
.bzrignore file to be versioned. Creating a .bzrignore file without
the use of the ignore command will require an explicit add command. If a second branch is provided, cross-branch reconciliation is
also attempted, which will check that data like the tree root
id which was not present in very early bzr versions is represented
correctly in both branches. If branch is omitted then the branch containing the current working
directory will be used. If branches have diverged, you can use 'bzr merge' to integrate the changes
from one into the other. Once one branch has merged, the other should
be able to pull it again. If branches have diverged, you can use 'bzr push --overwrite' to replace
the other branch completely, discarding its unmerged changes. If no arguments are given, all changes for the current tree are listed.
If files are given, only the changes in those files are listed.
Remote and multiple branches can be compared by using the --old and
--new options. If not provided, the default for both is derived from
the first argument, if any, or the current tree if no arguments are
given. If no arguments are specified, the status of the entire working
directory is shown. Otherwise, only the status of the specified
files or directories is reported. If a directory is given, status
is reported for everything inside that directory. If no restrictions are specified, all Bazaar data that is found at the given
location will be checked. If no revision is nominated, the last revision is used. If no revision is specified this exports the last committed revision. If one would like to merge changes from the working tree of the other
branch without merging any committed revisions, the --uncommitted option
can be given. If root is supplied, it will be used as the root directory inside
container formats (tar, zip, etc). If it is not supplied it will default
to the exported filename. The root option has no effect for 'dir' format. If the --no-trees option is given then the branches in the repository
will not have working trees by default. They will still exist as
directories on disk, but they will not have separate copies of the
files at a certain revision. This can be useful for repositories that
store branches which are interacted with through checkouts or remote
branches, such as on a server. If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
create ./foo-bar. If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
is derived from the FROM_LOCATION by stripping a leading scheme or drive
identifier, if any. For example, "branch lp:foo-bar" will attempt to
create ./foo-bar. If the destination is already completely merged into the source, pull from the source rather than merging. When this happens, you do not need to commit the result. If the last argument is a versioned directory, all the other names
are moved into it. Otherwise, there must be exactly two arguments
and the file is changed to a new name. If the location given is a shared repository, dependent branches
are also converted provided the repository converts successfully.
If the conversion of a branch fails, remaining branches are still
tried. If the tree's branch is bound to a master branch, bzr will also update
the branch from the master. If there are any uncommitted changes in the tree, they will be carried
across and remain as uncommitted changes after the update. To discard
these changes, use 'bzr revert'. The uncommitted changes may conflict
with the changes brought in by the change in basis revision. If there is a repository in a parent directory of the location, then
the history of the branch will be stored in the repository. Otherwise
init creates a standalone branch which carries its own history
in the .bzr directory. If there is already a branch at the location but it has no working tree,
the tree can be populated with 'bzr checkout'. If there is no default branch set, the first merge will set it (use
--no-remember to avoid setting it). After that, you can omit the branch
to use the default. To change the default, use --remember. The value will
only be saved if the remote location can be accessed. If there is no default location set, the first pull will set it (use
--no-remember to avoid setting it). After that, you can omit the
location to use the default. To change the default, use --remember. The
value will only be saved if the remote location can be accessed. If there is no default push location set, the first push will set it (use
--no-remember to avoid setting it). After that, you can omit the
location to use the default. To change the default, use --remember. The
value will only be saved if the remote location can be accessed. If you have newly added files since the target revision, they will be
removed. If the files to be removed have been changed, backups will be
created as above. Directories containing unknown files will not be
deleted. If you specify two values, "--revision BASE..OTHER", only revisions BASE
through OTHER, excluding BASE but including OTHER, will be merged. If this
causes some revisions to be skipped, i.e. if the destination branch does
not already contain revision BASE, such a merge is commonly referred to as
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
cherrypicks. The changes look like a normal commit, and the history of the
changes from the other branch is not stored in the commit. If you want to ensure you have the different changes in the other branch,
do a merge (see bzr help merge) from the other branch, and commit that.
After that you will be able to do a push without '--overwrite'. If you want to replace your local changes and just want your branch to
match the remote one, use pull --overwrite. This will work even if the two
branches have diverged. If you wish to upgrade to a particular format rather than the
current default, that can be specified using the --format option.
As a consequence, you can use the upgrade command this way to
"downgrade" to an earlier format, though some conversions are
a one way process (e.g. changing from the 1.x default to the
2.x default) so downgrading is not always possible. Ignore specified files or patterns. Ignoring files outside view. View is %s In non-recursive mode, all the named items are added, regardless
of whether they were previously ignored. A warning is given if
any of the named files are already versioned. In recursive mode (the default), files are treated the same way
but the behaviour for directories is different. Directories that
are already versioned do not give a warning. All directories,
whether already versioned or not, are searched for files or
subdirectories that are neither versioned or ignored, and these
are added. This search proceeds recursively into versioned
directories. If no names are given '.' is assumed. In recursive mode, files larger than the configuration option
add.maximum_file_size will be skipped. Named items are never skipped due
to file size. In verbose mode, statistical information is included with each report.
To see extended statistic information, use a verbosity level of 2 or
higher by specifying the verbose option multiple times, e.g. -vv. Instead of merging, show a diff of the merge. Invalid bug %s. Must be in the form of 'tracker:id'. See "bzr help bugs" for more information on this feature.
Commit refused. Invalid http range %(range)r for %(path)s: %(msg)s Invalid http response for %(path)s: %(msg)s%(orig_error)s Invalid ignore pattern found. %s Invalid ignore patterns found. %s Invalid range access in %(path)s at %(offset)s: %(msg)s Limit the output to the first N revisions. List all the ignored files and the ignore pattern that caused the file to
be ignored. List entries of a particular kind: file, directory, symlink. List files deleted in the working tree.
List files in a tree.
List ignored files and the patterns that matched them. List the branches available at the current location. List the installed plugins. Lookup file ids from this tree. Make a directory into a versioned branch. Manually set a commit time using commit date format, e.g. '2009-10-10 08:00:00 +0100'. Mark a bug as being fixed by this revision (see "bzr help bugs"). Merge even if the destination tree has uncommitted changes. Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562 Move only the bzr identifier of the file, because the file has already been moved. Move or rename a file. Moving the root directory is not supported at this time NAME_PATTERN should not be an absolute path Name of the root directory inside the exported file. Need working tree for --show-base. Never change revnos or the existing log. Append revisions to it only. New branch bound to %s New branches created under the repository directory will store their
revisions in the repository, not in the branch directory. For branches
with shared history, this reduces the amount of storage needed and
speeds up the creation of new branches. No bundle was found in "%(filename)s". No changes to commit. Please 'bzr add' the files you want to commit, or use --unchanged to force an empty commit. No location specified or remembered No matching files. No new revisions or tags to push. No new revisions to push. No pull location known or specified. No push location known or specified. No push location known or specified. To push to the parent branch (at %s), use 'bzr push :parent'. No tracker specified for bug %s. Use the form 'tracker:id' or specify a default bug tracker using the `bugtracker` option.
See "bzr help bugs" for more information on this feature. Commit refused. No working tree to remove Note that --short or -S gives status flags for each item, similar
to Subversion's status command. To get output similar to svn -q,
use bzr status -SV. Note that when using the -r argument with a range of revisions, the
differences are computed between the two specified revisions. That
is, the command does not show the changes introduced by the first
revision in the range. This differs from the interpretation of
revision ranges used by "bzr log" which includes the first revision
in the range. Note: Export of tree with non-ASCII filenames to zip is not supported. Note: Take care to redirect standard output when using this command on a
binary file. Note: The location can be specified either in the form of a branch,
or in the form of a path to a file containing a merge directive generated
with bzr send. Nothing to do. Number of levels to display - 0 for all, 1 for flat. OTHER_BRANCH may be local or remote. Only display errors and warnings. Only one path may be specified to --auto. Only remove files that have never been committed. Only show versioned files. Other branch has no new revisions.
Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with bzr repositories before 0.92 but cannot be read by bzr < 0.92. Parent directory of %s does not exist.
You may supply --create-prefix to create all leading parent directories. Parent of "%s" does not exist. Pass these options to the external diff program. Path unknown at end or start of revision range: %s Patterns prefixed with '!!' act as regular ignore patterns, but have
precedence over the '!' exception patterns. Patterns prefixed with '!' are exceptions to ignore patterns and take
precedence over regular ignores. Such exceptions are used to specify
files that should be versioned which would otherwise be ignored. Perform a lightweight checkout. Lightweight checkouts depend on access to the branch for every operation. Normal checkouts can perform common operations like diff and status without such access, and also support local commits. Perform a local commit in a bound branch. Local commits are not pushed to the master branch until a normal commit is performed. Perform a local pull in a bound branch. Local pulls are not applied to the master branch. Perform a three-way merge. Print ignored files. Print just the version number. Print or set the branch nickname. Print paths relative to the root of the branch. Print unknown files. Print versioned files. Pushed up to revision %d. Recipe for importing a tree of files:: Reconcile bzr metadata in a branch. Recurse into subdirectories. Recursively scan for branches rather than just looking in the specified location. Redo a merge. Refuse to commit if there are unknown files in the working tree. Refuse to push if there are uncommitted changes in the working tree, --no-strict disables the check. Remove files or directories. Remove pending merge marker, without changing any files. Remove the alias. Remove the backup.bzr directory if successful. Remove the working tree even if it has uncommitted or shelved changes. Remove the working tree from a given branch/checkout. Repository %r does not support access to raw revision texts Repository format Reverse the order of revisions. Revision numbers are always relative to the source branch. Revision {%(revision_id)s} already present in "%(file_id)s". Revision {%(revision_id)s} not present in "%(file_id)s". Same as --mine-only. Same as --theirs-only. See "help revisionspec" for details. See ``bzr help patterns`` for details on the syntax of patterns. Select changes interactively. Set identity for the current branch instead of globally. Set modification time of files to that of the last revision in which it was changed. Set prefixes added to old and new filenames, as two values separated by a colon. (eg "old/:new/"). Set the author's name, if it's different from the committer. Set/unset and display aliases. Show base revision text in conflicts. Show changes made in each revision as a patch. Show current revision number. Show differences in the working tree, between revisions or branches. Show digital signature validity. Show files changed in each revision. Show from oldest to newest. Show help on a command or other topic.
Show help on all commands. Show historical log for a branch or subset of a branch. Show information about a working tree, branch or repository. Show just the specified revision. See also "help revisionspec". Show list of renamed files.
Show logs of pulled revisions. Show merged revisions like --levels 0 does. Show or set bzr user id. Show revisions whose authors match this expression. Show revisions whose bugs match this expression. Show revisions whose committer matches this expression. Show revisions whose message matches this expression. Show revisions whose properties match this expression. Show revno of working tree. Show the tree root directory. Show unmerged/unpulled revisions between two branches. Show usage message and options. Show version of bzr. Show what would be done, but don't actually do anything. Show-base is not supported for this merge type. %s Since a lightweight checkout is little more than a working tree
this will refuse to run against one. Some smart servers or protocols *may* put the working tree in place in
the future. Sorry, remerge only works after normal merges. Not cherrypicking or multi-merges. Specify a format for this branch. See "help formats". Specify a format for this repository. See "bzr help formats" for details. Switch the checkout in the current directory to the new branch. Switched to branch: %s Tags can only be placed on a single revision, not on a range Take commit message from this file. Target directory "%s" already exists. Text did not match its checksum: %(msg)s The 'dir' argument, if given, must be the location of the root of a
working tree to update. By default, the working tree that contains the
current working directory is used. The --verbose option will display the revisions pulled using the log_format
configuration option. You can use a different format by overriding it with
-Olog_format=<other_format>. The --verbose option will display the revisions pushed using the log_format
configuration option. You can use a different format by overriding it with
-Olog_format=<other_format>. The 2a format with experimental support for colocated branches.
The branch *MUST* be on a listable system such as local disk or sftp. The branch {0} has no revision {1}. The file deletion mode to be used. The filtering, ordering and information shown for each revision can
be controlled as explained below. By default, all revisions are
shown sorted (topologically) so that newer revisions appear before
older ones and descendants always appear before ancestors. If displayed,
merged revisions are shown indented under the revision in which they
were merged. The levels argument must be an integer. The limit argument must be an integer. The options for remerge have the same meaning and defaults as the ones for
merge. The difference is that remerge can (only) be run when there is a
pending merge, and it lets you specify particular files. The path name in the old tree. The repository {0} contains no revision {1}. The results of the merge are placed into the destination working
directory, where they can be reviewed (with bzr diff), tested, and then
committed to record the result of the merge. The root is the nearest enclosing directory with a .bzr control
directory. The source of the merge can be specified either in the form of a branch,
or in the form of a path to a file containing a merge directive generated
with bzr send. If neither is specified, the default is the upstream branch
or the branch most recently merged using --remember. The source of the
merge may also be specified in the form of a path to a file in another
branch: in this case, only the modifications to that file are merged into
the current working tree. The synonyms 'clone' and 'get' for this command are deprecated. The target branch will not have its working tree populated because this
is both expensive, and is not supported on remote file systems. The tree does not appear to be corrupt. You probably want "bzr revert" instead. Use "--force" if you are sure you want to reset the working tree. The working tree and branch checks will only give output if a problem is
detected. The output fields of the repository check are: The working tree for %(basedir)s has changed since the last commit, but weave merge requires that it be unchanged Therefore simply saying 'bzr add' will version all files that
are currently unknown. This branch format cannot be set to append-revisions-only. Try --default. This branch has no commits. (perhaps you would prefer 'bzr pull') This branch has no new revisions.
This can correct data mismatches that may have been caused by
previous ghost operations or bzr upgrades. You should only
need to run this command if 'bzr check' or a bzr developer
advises you to run it. This command checks various invariants about branch and repository storage
to detect data corruption or bzr bugs. This command displays the list of installed plugins including
version of plugin and a short description of each. This command only works on branches that have not diverged. Branches are
considered diverged if the destination branch's most recent commit is one
that has not been merged (directly or indirectly) by the source branch. This command will print the names of all the branches at the current
location. This command will show all known locations and formats associated to the
tree, branch or repository. This is equal to the number of revisions on this branch. This is equivalent to creating the directory and then adding it. This makes Bazaar stop tracking changes to the specified files. Bazaar will
delete them if they can easily be recovered using revert otherwise they
will be backed up (adding an extension of the form .~#~). If no options or
parameters are given Bazaar will scan for files that are being tracked by
Bazaar but missing in your tree and stop tracking them for you. This operation compresses the data within a bazaar repository. As
bazaar supports automatic packing of repository, this operation is
normally not required to be done manually. This reports on versioned and unknown files, reporting them
grouped by state. Possible states are: This will perform a merge of the destination revision (the tip of the
branch, or the specified revision) into the working tree, and then make
that revision the basis revision for the working tree. To compare the working directory to a specific revision, pass a
single revision to the revision argument. To pick a different ending revision, pass "--revision OTHER". bzr will
try to merge in all new work up to and including revision OTHER. To re-create the working tree, use "bzr checkout". To remove patterns from the ignore list, edit the .bzrignore file.
After adding, editing or deleting that file either indirectly by
using this command or directly by using an editor, be sure to commit
it. To retrieve the branch as of a particular revision, supply the --revision
parameter, as in "branch foo/bar -r 5". To retrieve the branch as of a particular revision, supply the --revision
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
out of date [so you cannot commit] but it may be useful (i.e. to examine old
code.) To see ignored files use 'bzr ignored'. For details on the
changes to file texts, use 'bzr diff'. To see which files have changed in a specific revision, or between
two revisions, pass a revision range to the revision argument.
This will produce the same results as calling 'bzr diff --summarize'. To select only some changes to merge, use "merge -i", which will prompt
you to apply each diff hunk and file change, similar to "shelve". Too many redirections Tree is up to date at revision {0} of branch {1} Turn this branch into a mirror of another branch. Type of file to export to. Unable to import library "%(library)s": %(error)s Unrecognized bug %s. Commit refused. Unstacking Unsupported export format: %s Update a mirror of this branch. Update a working tree to a new revision. Updated to revision {0} of branch {1} Upgrade a repository, branch or working tree to a newer format. Upgrade to a specific format. See "bzr help formats" for details. Use bzr resolve when you have fixed a problem. See also bzr conflicts. Use short status indicators. Use this command to compare files. Use this if you want to try a different merge technique while resolving
conflicts. Some merge techniques are better than others, and remerge
lets you try different ones on different files. Use this to create an empty branch, or before importing an
existing project. Using saved parent location: %s
Using saved parent location: {0}
Using saved push location: %s Using shared repository: %s
Validate working tree structure, branch consistency and repository history. Versioned file error Warning: If you use --clean-obsolete-packs and your machine crashes
during or immediately after repacking, you may be left with a state
where the deletion has been written to disk but the new packs have not
been. In this case the repository may be unusable. Warning: the following files are version controlled and match your ignore pattern:
%s
These files will continue to be version controlled unless you 'bzr remove' them.
What names to list as authors - first, all or committer. When committing to a foreign version control system do not push data that can not be natively represented. When merging from a branch, by default bzr will try to merge in all new
work from the other branch, automatically determining an appropriate base
revision. If this fails, you may need to give an explicit base. When no message is supplied, show the diff along with the status summary in the message editor. When the default format has changed after a major new release of
Bazaar, you may be informed during certain operations that you
should upgrade. Upgrading to a newer format may improve performance
or make new features available. It may however limit interoperability
with older repositories or with older versions of Bazaar. When you provide files, you can use their current pathname or the pathname
from the target revision. So you can use revert to "undelete" a file by
name. If you name a directory, all the contents of that directory will be
reverted. Working tree has conflicts. Write the contents of a file as of a given revision to standard output. You can only supply one of revision_id or --revision You can use this to visit an older revision, or to update a working tree
that is out of date from its branch. You cannot remove the working tree from a lightweight checkout You cannot remove the working tree of a remote path You cannot specify a NULL revision. You cannot update just a single file or directory, because each Bazaar
working tree has just a single basis revision. If you want to restore a
file that has been removed locally, use 'bzr revert' instead of 'bzr
update'. If you want to restore a file to its state in a previous
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
out the old content of that file to a new location. You must supply either --revision or a revision_id Your local commits will now show as pending merges with 'bzr status', and can be committed with 'bzr commit'. added
Versioned in the working copy but not in the previous revision. added %s
branch has no revision %s
bzr update --revision only works for a revision in the branch history bzr %s --revision takes exactly one revision identifier bzr %s --revision takes one or two values. bzr %s doesn't accept two revisions in different branches. bzr alias --remove expects an alias to remove. bzr cat --revision takes exactly one revision specifier bzr diff --revision takes exactly one or two revision specifiers bzr status --revision takes exactly one or two revision specifiers bzr update --revision takes exactly one revision bzr update can only update a whole tree, not a file or subdirectory can not move root of branch cannot specify both --from-root and PATH checked branch {0} format {1} failed to reset the tree state{0} found error:%s ignore requires at least one NAME_PATTERN or --default-rules. ignored {0} matching "{1}"
invalid kind %r specified invalid kind specified kind changed
File kind has been changed (e.g. from file to directory). log is bzr's default tool for exploring the history of a branch.
The branch to use is taken from the first parameter. If no parameters
are given, the branch containing the working directory is logged.
Here are some simple examples:: merge base is revision %s
merge refuses to run if there are any uncommitted changes, unless
--force is given. If --force is given, then the changes from the source
will be merged with the current working tree, including any uncommitted
changes in the tree. The --force option can also be used to create a
merge revision which has more than two parents. merger: missing file argument modified modified
Text has changed since the previous revision. not a valid revision-number: %r please specify a commit message with either --message or --file please specify either --message or --file python-gpgme is not installed, it is needed to verify signatures removed
Versioned in the previous revision but removed or deleted
in the working copy. renamed
Path of this file changed from the previous revision;
the text may also have changed. This includes files whose
parent directory was renamed. repeated file texts
This is the total number of repeated texts seen
in the checked revisions. Texts can be repeated when their file
entries are modified, but the file contents are not. It does not
indicate a problem. revisions
This is just the number of revisions checked. It doesn't
indicate a problem. skipping {0} (larger than {1} of {2} bytes) to mv multiple files the destination must be a versioned directory unique file texts
This is the total number of unique file contents
seen in the checked revisions. It does not indicate a problem. unknown
Not versioned and not matching an ignore pattern. unreferenced ancestors
Texts that are ancestors of other texts, but
are not properly referenced by the revision ancestry. This is a
subtle problem that Bazaar can work around. versionedfiles
This is just the number of versionedfiles checked. It
doesn't indicate a problem. {0!r} is not present in revision {1} {0} and {1} are mutually exclusive {0} remembered {1} location {2} Project-Id-Version: bzr
Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>
POT-Creation-Date: 2012-07-10 11:35+0200
PO-Revision-Date: 2013-05-21 08:54+0000
Last-Translator: epii <public.epii@gmail.com>
Language-Team: Japanese <ja@li.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Plural-Forms: nplurals=1; plural=0;
X-Launchpad-Export-Date: 2013-05-22 04:30+0000
X-Generator: Launchpad (build 16626)
マスタブランãƒã«ã‚³ãƒŸãƒƒãƒˆã™ã‚‹ã«ã¯ã€å…ˆã«updateã—ã¦ãã ã•ã„。
--localを指定ã—ã¦ã‚ªãƒ•ãƒ©ã‚¤ãƒ³ã§ã‚³ãƒŸãƒƒãƒˆã—ã€ä½œæ¥ã‚’続ã‘ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ bzr alias bzr alias --remove ll bzr alias ll bzr alias ll="log --line -r-10..-1" bzr check --repo bar bzr check --tree --branch foo bzr check baz bzr checkout --lightweight repo/trunk trunk-checkout
cd trunk-checkout
(ã“ã“ã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ ) bzr diff bzr diff --old xxx bzr diff --old xxx --new yyy NEWS bzr diff --prefix old/:new/
カスタムã®diffプãƒã‚°ãƒ©ãƒ ã«ã‚ªãƒ—ションを指定ã—ã¦ã€å·®åˆ†ã‚’表示ã—ã¾ã™ã€‚::
bzr diff --using /usr/bin/diff --diff-options -wu bzr diff -c2 bzr diff -r-2.. bzr diff -r1 bzr diff -r1..3 bzr diff -r1..3 xxx bzr diff -r<対象ã®è¦ªãƒªãƒ“ジョン>..X bzr diff NEWS bzr diff xxx/NEWS bzr ignore "!special.class" bzr ignore "*.class" bzr ignore "RE:(?!debian/).*"
â€localâ€ãƒˆãƒƒãƒ—レベルディレクトリé…下以外ã®å…¨ã¦ã‚’無視ã™ã‚‹,
ãŸã ã—ã€~ã§çµ‚ã‚る自動セーブファイルã¯ã€local/é…下ã§ã‚ã£ã¦ã‚‚無視ã™ã‚‹::
bzr ignore "*"
bzr ignore "!./local"
bzr ignore "!!*~" bzr ignore "RE:^#" bzr ignore "RE:lib/.*\.o" bzr ignore "lib/**/*.o" bzr ignore ./Makefile bzr init-repo --no-trees repo
bzr init repo/trunk bzr merge -r 81..82 ../bzr.dev bzr merge -r 82 ../bzr.dev bzr merge ../bzr.dev bzr merge ../feature1a
bzr merge ../feature1b --force
bzr commit -m 'revision with three parents' bzr merge /tmp/merge bzr missing bzr missing --my-revision ..-10 bzr missing -r ..-10 bzr missing http://server/branch bzr remerge --merge-type weave --reprocess foobar bzr remerge --show-base bzr whoami "Frank Chu <fchu@example.com>" bzr whoami --email -l N 最大N個ã®ãƒªãƒ“ジョンを表示ã—ã¾ã™ã€‚
-n N Nレベルã®ãƒªãƒ“ジョンを表示ã—ã¾ã™ã€‚(0ã§å…¨ã¦ã€1ã§ãƒ¡ã‚¤ãƒ³ãƒ©ã‚¤ãƒ³ã®ã¿)
-v ステータスã®ã‚µãƒžãƒª(差分)ã‚’å„リビジョンã«è¡¨ç¤ºã—ã¾ã™ã€‚
-p Diff(patch)ã‚’å„リビジョンã«è¡¨ç¤ºã—ã¾ã™ã€‚
--show-ids リビジョン番å·ã ã‘ã§ãªãã€ãƒªãƒ“ジョンIDã¨ãƒ•ã‚¡ã‚¤ãƒ«IDも表示ã—ã¾ã™ã€‚〠-r-1 Tipã ã‘を表示
-r-10.. メインラインã®æœ€æ–°10リビジョンを表示
-rsubmit:.. ã“ã®ãƒ–ランãƒã§ã®å¤‰æ›´å†…容を表示
-rancestor:path.. ã“ã®ãƒ–ランãƒã¨åˆ¥ã®ãƒ–ランãƒã¨ã®åˆ†å²ç‚¹ã‹ã‚‰ã®
変更を表示
-rdate:yesterday.. 昨日ã‹ã‚‰ã®å¤‰æ›´ã‚’表示 -rX リビジョンXを表示
-rX.. リビジョンX以é™ã‚’表示
-r..Y リビジョンY以å‰(Yã‚’å«ã‚€)を表示
-rX..Y リビジョンXã‹ã‚‰Y(Xã€Yã‚’å«ã‚€)を表示 ..."special.class" ã¯ç„¡è¦–ã—ãªã„:: ‘baz’ ã§ã™ã¹ã¦ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹:: ‘bar’ã§ã®ãƒªãƒã‚¸ãƒˆãƒªã®ã¿ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹:: ‘foo’ ã§ã®ãƒ„リーã¨ãƒ–ランãƒã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹:: ブランãƒxxxã®ãƒªãƒ“ジョン３ã¨ãƒªãƒ“ジョン１を比較ã—ã¾ã™ã€‚:: リビジョン３ã¨ãƒªãƒ“ジョン１を比較ã—ã¾ã™ã€‚:: 作æ¥ãƒ„リーã¨ãƒªãƒ“ジョン１を比較ã—ã¾ã™ã€‚:: ã™ã¹ã¦ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®.classファイルを無視ã™ã‚‹ãŒ...:: libディレクトリé…下ã®.oファイルを無視ã™ã‚‹:: "debian"トップレベルディレクトリ以外ã®å…¨ã¦ã‚’無視ã™ã‚‹:: #ã§å§‹ã¾ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’無視ã™ã‚‹:: 別ã®å ´æ‰€ã«è»½é‡ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã‚’作æˆã—ã¾ã™ã€‚:: マージã•ã‚ŒãŸãƒªãƒ“ジョンã®å ´åˆã¯ã€-cオプションã¯å·¦å´ã®è¦ªã‹ã‚‰ã®å¤‰æ›´ã‚’表示ã™ã‚‹
ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。他ã®è¦ªã‹ã‚‰ã®å¤‰æ›´ã‚’見るã«ã¯ã€ä»¥ä¸‹ã®ã‚ˆã†ã«ã—ã¾ã™ã€‚:: "foobar"ã®ãƒžãƒ¼ã‚¸ã‚’ã€weaveマージアルゴリズムã§ã‚„ã‚ŠãªãŠã—ã€è¡çªé ˜åŸŸã®
縮å°åŒ–処ç†ã‚‚è¡Œã„ã¾ã™ã€‚:: 'bzr diff'ã¨åŒã˜ã§ã™ãŒã€ãƒ—レフィックスold/ã€new/ã‚’ä»˜åŠ ã—ã¾ã™ã€‚:: エイリアス'll'ã‚’è¨å®šã—ã¾ã™ã€‚:: ユーザをè¨å®šã—ã¾ã™ã€‚:: ファイルNEWSã®å¤‰æ›´ã ã‘を表示ã—ã¾ã™ã€‚:: 'll'ã«è¨å®šã•ã‚Œã¦ã„るエイリアスを表示ã—ã¾ã™ã€‚:: ï¼’ã¤ã®ãƒ–ランãƒé–“ã§ã®ã€ãƒ•ã‚¡ã‚¤ãƒ«NEWSã®å·®åˆ†ã‚’表示ã—ã¾ã™ã€‚:: ブランãƒxxxã¨ä½œæ¥ãƒ„リーã¨ã®é–“ã®å·®åˆ†ã‚’表示ã—ã¾ã™ã€‚:: 作æ¥ãƒ„リーxxxã®ã€ãƒ•ã‚¡ã‚¤ãƒ«NEWSã®å¤‰æ›´å†…容を表示ã—ã¾ã™ã€‚:: ç¾åœ¨ã®ãƒªãƒ“ジョンã¨ä¸€ã¤å‰ã®ãƒªãƒ“ジョンã¨ã®å·®åˆ†ã§ã™ã€‚(-c-1 〠-r-2..-1 ã¨åŒã˜) リビジョン２ã§ã®å¤‰æ›´ã§ã™ã€‚(-r1..2 ã¨åŒã˜ã§ã™ã€‚):: /tmp/merge内ã®ãƒžãƒ¼ã‚¸ãƒ‡ã‚£ãƒ¬ã‚¯ãƒ†ã‚£ãƒ–ã‚’é©ç”¨ã—ã¾ã™ã€‚:: feature1aã€feature1bã®ï¼’ã¤ã®ãƒ–ランãƒã‹ã‚‰ã€ï¼“ã¤ã®è¦ªã‚’æŒã¤ãƒžãƒ¼ã‚¸
リビジョンを作りã¾ã™ã€‚:: bzr.devã‹ã‚‰ã€ãƒªãƒ“ジョン82ã¾ã§(82ã‚‚å«ã‚€)ã®ãƒªãƒ“ジョンをマージã—ã¾ã™:: リビジョン82ã§ã®å¤‰æ›´ã‚’マージã—ã€ãれ以å‰ã®å¤‰æ›´ã¯ãƒžãƒ¼ã‚¸ã—ã¾ã›ã‚“。:: エイリアス'll'を解除ã—ã¾ã™ã€‚:: リビジョンXã§ã®å¤‰æ›´ã‚’見るã«ã¯ã€::
bzr diff -cX [ALIASES]
tip = log -r-1
top = log -l10 --line
show = log -v -p bzr commit foo -x foo/bar bzr info bzr info -v bzr info -vv bzr ls --ignored bzr mv SOURCE... DESTINATION cd ~/project
bzr init
bzr add .
bzr status
bzr commit -m "imported project" * ``bzr log -r2 -p guide.txt`` ã¯ã€ãƒªãƒ“ジョン2ã«ã¯guide.txtã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãªã„
ã¨ã„ã†ã‚¨ãƒ©ãƒ¼ã‚’表示ã—ã¾ã™ã€‚ * ``bzr log -r2 -p tutorial.txt`` ã¯ã€å…ƒã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒªãƒ“ジョン2ã§ã®å¤‰æ›´
を表示ã—ã¾ã™ã€‚ * ``bzr log guide.txt`` ã¯ã€ãƒªãƒ“ジョン1ã§è¿½åŠ ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示ã—ã¾ã™ã€‚ * ``bzr log tutorial.txt`` ã¯ã€ãƒªãƒ“ジョン3ã§è¿½åŠ ã•ã‚ŒãŸæ–°ã—ã„ファイルを表示ã—ã¾ã™ã€‚ * リビジョン 1: tutorial.txt を追åŠ
* リビジョン 2: tutorial.txt
* リビジョン 3: tutorial.txt ã‚’ guide.txt ã«å¤‰åã—ã€add tutorial.txt ã‚’è¿½åŠ ==================== ====================
サãƒãƒ¼ãƒˆãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ æ‹¡å¼µåã«ã‚ˆã‚‹è‡ªå‹•æ¤œå‡º
==================== ====================
dir (none)
tar .tar
tbz2 .tar.bz2, .tbz2
tgz .tar.gz, .tgz
zip .zip
==================== ==================== よãã‚るミスã¨ã—ã¦ã€æ–°ã—ã作ã£ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚„ディレクトリをコミットå‰ã«è¿½åŠ ã™ã‚‹ã®ã‚’
忘れã¦ã—ã¾ã†ã¨ã„ã†ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚--strictオプションを指定ã™ã‚‹ã¨ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†
外ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚‹å ´åˆã¯ã‚³ãƒŸãƒƒãƒˆãŒå¤±æ•—ã™ã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚ã‚‚ã£ã¨é«˜åº¦ãªã‚³ãƒŸãƒƒãƒˆ
å‰ãƒã‚§ãƒƒã‚¯ã‚’フックã¨ã—ã¦å®Ÿè£…ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚詳細㯠``bzr help hooks`` ã‚’
ã”覧ãã ã•ã„。 マージ後ã®éƒ¨åˆ†çš„ãªã‚³ãƒŸãƒƒãƒˆã¯ã¾ã サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。 フォーマットã¨é–¢é€£ã™ã‚‹å ´æ‰€ã«ã¤ã„ã¦ã®æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚ より詳細ãªãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆæƒ…å ±ã¨ã€åŸºæœ¬çš„ãªçµ±è¨ˆæƒ…å ±(作æ¥ãƒ„リー内ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®
æ•°ã€ãƒ–ランãƒã€ãƒªãƒã‚¸ãƒˆãƒªå†…ã®ãƒªãƒ“ジョンã®æ•°ãªã©)を一緒ã«è¡¨ç¤ºã—ã¾ã™ã€‚: ã•ã‚‰ã«ã€ã“ã®ãƒ–ランãƒã«ã‚³ãƒŸãƒƒãƒˆã—ãŸäººã®æ•°ã‚‚表示ã—ã¾ã™ã€‚: ファイルåã¯ã€å±¥æ´ã®ã‚³ãƒ³ãƒ†ã‚スト内ã§è§£é‡ˆã•ã‚Œã¾ã™ã€‚削除ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®
ãƒã‚°ã‚’表示ã™ã‚‹ã«ã¯ã€ãã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå˜åœ¨ã—ãŸãƒªãƒ“ジョンをã€ãƒªãƒ“ジョンã®ç¯„囲
ã®æœ€åˆã‹æœ€å¾Œã«æŒ‡å®šã—ã¦ãã ã•ã„。 å±¥æ´ã‚’見るã«ã¯ã€CUIよりもGUIã‚„IDEã®æ–¹ãŒã„ã„ã“ã¨ã‚‚多ã„ã§ã—ょã†ã€‚qlogã€
qbzrã‚„bzr-gtkã®ãƒ“ジュアライゼーションã€bzr-explorerシェルã€LoggerHead
ã®Webインターフェイスãªã©ãŒæ°—ã«å…¥ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã‚“。プラグインガイド
<http://doc.bazaar.canonical.com/plugins/en/> ã‚„ã€
<http://wiki.bazaar.canonical.com/IDEIntegration> ã‚’ã”覧ãã ã•ã„。 å±¥æ´ã®ã‚³ãƒ³ãƒ†ã‚ストã¯ã€å¤‰åã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚„ディレクトリã®ãƒ‘スåを解釈ã™ã‚‹
éš›ã«ã‚‚é‡è¦ã«ãªã‚Šã¾ã™ã€‚以下ã®ä¾‹ã‚’考ãˆã¦ãã ã•ã„。： コミット後ã«ãƒ•ãƒƒã‚¯ã‚’実行ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ã“ã‚Œã«ã‚ˆã£ã¦ã€ãƒã‚°ãƒˆãƒ©ãƒƒã‚«ãƒ¼ãªã©ã®
外部ã®ã‚·ã‚¹ãƒ†ãƒ ã‚’æ›´æ–°ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ --fixesオプションã§ã€ãƒªãƒ“ジョンã¨
ãƒã‚°ã¨ã®é–¢ä¿‚を記録ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚詳細㯠``bzr help bugs`` を見ã¦
ãã ã•ã„。 パラメータãŒæŒ‡å®šã•ã‚Œã¦ã„ã¦ã€ä¸€ã¤ç›®ã®ãƒ‘ラメータãŒãƒ–ランãƒã§ã¯ãªã„å ´åˆã€
指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒå¤‰æ›´ã•ã‚ŒãŸãƒªãƒ“ジョンã ã‘ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ ファイルãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ãã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´ã ã‘ãŒã‚³ãƒŸãƒƒãƒˆã•ã‚Œã¾ã™ã€‚
ディレクトリãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ãã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ãã®é…下ã™ã¹ã¦ãŒ
コミット対象ã«ãªã‚Šã¾ã™ã€‚ ã‚‚ã—ã€å¤‰æ›´ã‚’è¡Œã£ãŸäººã¨ã‚³ãƒŸãƒƒãƒˆã™ã‚‹äººãŒã¡ãŒã†å ´åˆã¯ã€ä½œè€…ã®åå‰ã‚’--author
オプションã§æŒ‡å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"John Doe <jdoe@example.com>"ã®
よã†ã«ã€ã‚³ãƒŸãƒƒã‚¿ãƒ¼ã®IDã¨åŒã˜ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã§æŒ‡å®šã™ã‚‹ã¹ãã§ã™ã€‚複数ã®ä½œè€…ãŒ
ã„ã‚‹ãªã‚‰ã€ã“ã®ã‚ªãƒ—ションを複数回指定ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ ã‚‚ã—ã€é–“é•ã£ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’コミットã—ã¦ã—ã¾ã£ãŸã‚Šã€ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã«ã‚¹ãƒšãƒ«
ミスãŒã‚ã£ãŸå ´åˆã¯ã€uncommitコマンドã§ã‚³ãƒŸãƒƒãƒˆã‚’å–り消ã™ã“ã¨ãŒã§ãã¾ã™ã€‚
詳細㯠``bzr help uncommit`` ã‚’ã”覧ãã ã•ã„。 特定ã®ãƒžãƒ¼ã‚¸Xã«ã¤ã„ã¦è©³ã—ã見ãŸã„å ´åˆã¯ã€ ``bzr log -n0 -rX`` を使用ã—ã¾ã™ã€‚ ã“ã®å ´åˆ: デフォルトã®è¡¨ç¤ºãƒ¬ãƒ™ãƒ«ã¯ã€ãƒã‚°ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã®æ©Ÿèƒ½ã§ã‚ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。
-nオプションãŒä½¿ç”¨ã•ã‚Œãªã„å ´åˆã¯ã€æ¨™æº–ã®ãƒã‚°ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã¯ãƒˆãƒƒãƒ—レベル(メイン
ライン)ã ã‘を表示ã—ã¾ã™ã€‚ 変åã¯å¸¸ã«å±¥æ´ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚明示的ã«æŒ‡å®šã™ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。(ã¾ãŸã€
最後ã«å¤‰åã•ã‚Œã‚‹ä»¥å‰ã®ãƒã‚°ã‚’切りæ¨ã¦ã‚‹æ–¹æ³•ã‚‚ã‚ã‚Šã¾ã›ã‚“) Xã€Yã®æŒ‡å®šæ–¹æ³•ã®è©³ç´°ã¯ã€ ``bzr help revisionspec`` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
よãã‚る例を以下ã«ç¤ºã—ã¾ã™ã€‚:: ステータスã®ã‚µãƒžãƒªã¯ã€Aã€Mãªã©ã®ãƒ•ãƒ©ã‚°ã§è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ ã‹ã‚ã‚Šã« ``added``ã€
``modified`` ãªã©ã®å˜èªžã§è¡¨ç¤ºã™ã‚‹ã«ã¯ã€-vvオプションを使用ã—ã¦ãã ã•ã„。 --matchオプションã§ã€æ£è¦è¡¨ç¾ã«ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã€ã‚³ãƒŸãƒƒã‚¿ãƒ¼ã€è‘—者ã€ãƒã‚°ãŒ
マッãƒã™ã‚‹ãƒªãƒ“ジョンを検索ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚オプションを複数回指定ã—ãŸ
å ´åˆã¯ã€ã©ã‚Œã‹ã²ã¨ã¤ã«ãƒžãƒƒãƒã™ã‚Œã°æ¤œç´¢ã•ã‚Œã¾ã™ã€‚--match-authorã€
--match-bugã€--match-committerã€--match-messageã§ã€æŒ‡å®šã—ãŸãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰
ã ã‘を検索対象ã«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ -rオプションã§ã€ã©ã®ãƒªãƒ“ジョンã€ã‚‚ã—ãã¯ãƒªãƒ“ジョンã®ç¯„囲を表示ã™ã‚‹ã‹ã‚’指定ã™ã‚‹
ã“ã¨ãŒã§ãã¾ã™ã€‚ã„ã‚ã„ã‚ãªä¾‹ã‚’以下ã«ç¤ºã—ã¾ã™ã€‚:: 以下ã®ã‚ªãƒ—ションã§ã€ã©ã®æƒ…å ±ã‚’è¡¨ç¤ºã™ã‚‹ã‹ã‚’コントãƒãƒ¼ãƒ«ã§ãã¾ã™ã€‚ ãƒã‚°ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã®æŒ‡å®šã«ã‚ˆã£ã¦ã€å„リビジョンã®æƒ…å ±ãŒã©ã†è¡¨ç¤ºã•ã‚Œã‚‹ã‹ã‚’
コントãƒãƒ¼ãƒ«ã—ã¾ã™ã€‚標準ã®ãƒã‚°ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«ã¯ ``long`` ã€``short`` 〠``line``
ãŒã‚ã‚Šã¾ã™ã€‚デフォルトã¯longã§ã™ã€‚ãƒã‚°ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«ã¤ã„ã¦ã®è©³ç´°ã¯
``bzr help log-formats`` ã‚’ã”覧ãã ã•ã„。 å¤ã„リビジョンã‹ã‚‰æ–°ã—ã„リビジョンã®é †ã§è¡¨ç¤ºã™ã‚‹ã«ã¯ã€ --forwardオプションを
使ã„ã¾ã™ã€‚--forwardã¯ã€--reverseã®ã‚ˆã†ã«ãƒã‚°ã‚’インクリメンタルã«è¡¨ç¤ºã¯ã—ã¾ã›ã‚“
ãŒã€ãŸã„ã¦ã„ã®å ´åˆã€ãƒã‚°è¡¨ç¤ºã«ã‹ã‹ã‚‹æ™‚é–“ã¸ã®å½±éŸ¿ã¯ã‚ãšã‹ã§ã™ã€‚ excludesã®æŒ‡å®šã¯ã€ã‚³ãƒŸãƒƒãƒˆå¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®æŒ‡å®šã‚ˆã‚Šã‚‚優先ã•ã‚Œã¾ã™ã€‚
ãŸã¨ãˆã°ã€fooé…下ã®å¤‰æ›´ã‚’コミットã™ã‚‹ãŒã€foo/bar内ã¯ã‚³ãƒŸãƒƒãƒˆã—ãªã„ã¨ã„ã†
å ´åˆã¯:: æ·±ã„å±¥æ´ã‚’ã‚‚ã¤å¤§è¦æ¨¡ãªãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ã€ãƒ¡ã‚¤ãƒ³ãƒ©ã‚¤ãƒ³ä»¥å¤–ã®å±¥æ´ã‚’è¦‹ã‚‹å ´åˆã¯ã€
historycacheプラグインをインストールã™ã‚‹ã“ã¨ã§ãƒ‘フォーマンスを大ãã改善
ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã®ãƒ—ラグインã¯ã€å±¥æ´æƒ…å ±ã‚’ã‚ャッシュã—ã¦ã€ãƒ‡ã‚£ã‚¹ã‚¯
スペースã¨å¼•ãæ›ãˆã«é«˜é€Ÿãªãƒ‘フォーマンスをもãŸã‚‰ã—ã¾ã™ã€‚ -rX..Yã§ãƒªãƒ“ジョンã®ç¯„囲を指定ã—ãŸå ´åˆã€ãƒã‚°ã¯ãƒªãƒ“ジョンYã‹ã‚‰å§‹ã¾ã£ã¦
メインã®(å·¦å´ã®)親をXã«åˆ°é”ã™ã‚‹ã¾ã§é¡ã‚Šã¾ã™ã€‚トップレベルã ã‘を表示
ã™ã‚‹å ´åˆ(-n1を使用)ã€XãŒãã®ãƒ«ãƒ¼ãƒˆã«è¦‹ã¤ã‹ã‚‰ãªã‘ã‚Œã°ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã™ã€‚
他段階ã®ãƒã‚°(-n0を使用)を表示ã™ã‚‹å ´åˆã¯ã€Xã¯å…¥ã‚Œåã«ãªã£ãŸãƒžãƒ¼ã‚¸
リビジョンã®ä¸ã«è¦‹ã¤ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。ãã®å ´åˆã€ãƒã‚°ã¯é©åˆ‡ã«åˆ‡ã‚Šæ¨ã¦
られã¾ã™ã€‚ ``bazaar.conf`` ã«ä»¥ä¸‹ã®ã‚ˆã†ãªã‚¨ã‚¤ãƒªã‚¢ã‚¹ã‚’è¿½åŠ ã—ã¦ãŠãã¨ä¾¿åˆ©ã§ã™ã€‚:: 多ãã®ãƒªãƒ“ジョンをæŒã¤ãƒ–ランãƒã§ ``bzr log -v`` を実行ã™ã‚‹ã®ã¯ã€ä»Šã®
ã¨ã“ã‚éžå¸¸ã«é…ã„ã§ã™ã€‚ã“ã®å•é¡Œã®ä¿®æ£ã¯ç¾åœ¨å¯¾å¿œä¸ã§ã™ãŒã€ã„ãšã‚Œã«
ã—ã¦ã‚‚ã€-vオプションを指定ã™ã‚‹ã¨ãã¯ãƒªãƒ“ジョンã®ç¯„囲を指定ã™ã‚‹ã“ã¨ã‚’
ãŠã™ã™ã‚ã—ã¾ã™ã€‚ ``bzr tip`` ã¯æœ€æ–°ã®ãƒªãƒ“ジョンを表示ã—〠``bzr top`` ã¯ãƒ¡ã‚¤ãƒ³ãƒ©ã‚¤ãƒ³ã®æœ€æ–°ã®
10リビジョンを表示ã—ã¾ã™ã€‚特定ã®ãƒªãƒ“ジョンXã®è©³ç´°ã‚’見るã«ã¯ã€ ``bzr show -X``
を使用ã—ã¾ã™ã€‚ bzrã«ã¯ã€åŒ…括的ãªå…¨æ–‡æ¤œç´¢ãƒžãƒƒãƒã‚’ã™ã‚‹bzr-searchã¨ã„ã†ãƒ—ラグインãŒã‚ã‚Šã€
ユーザåã€ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãªã©ã§ãƒªãƒ“ジョンを検索ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
ä»–ã®æ©Ÿèƒ½ã¨ã¯ã¡ãŒã„ã€ã“ã®ãƒ—ラグインã§ã¯å˜èªžã®ãƒªã‚¹ãƒˆã‚’å«ã‚€ã™ã¹ã¦ã®
リビジョンを検索ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ bzr log ã¯ã€ç¾åœ¨ã®ãƒ–ランãƒã®å±¥æ´ã‚’表示ã—ã¾ã™ã€‚
bzr log foo,py ã¯ã€ãƒ–ランãƒå†…ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å±¥æ´ã‚’表示ã—ã¾ã™ã€‚
bzr log http://server/branch ã¯ã€ã‚µãƒ¼ãƒä¸Šã®ãƒ–ランãƒã®ãƒã‚°ã‚’表示ã—ã¾ã™ã€‚ "bzr diff -p1"ã¯ã€"bzr diff --prefix old/:new/" ã¨åŒã˜ã§ã€"patch -p1"ã«
準ã˜ãŸãƒ‘ッãƒã‚’出力ã—ã¾ã™ã€‚ %(msg)s %(host)s%(port)s%(orig_error)s %(username)r ã«æœ‰åŠ¹ãª e-mail アドレスãŒå«ã¾ã‚Œã¦ã„ãªã„よã†ã§ã™ %d 個ã®ã‚¿ã‚°ã‚’æ›´æ–°ã—ã¾ã—㟠%s
コミットã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚ (--forceオプションã¯å»ƒæ¢äºˆå®šã§ã™ã€‚今後ã¯--no-backupを使用ã—ã¦ãã ã•ã„) (デフォルト) * #ã§å§‹ã¾ã‚‹ç„¡è¦–パターンã¯ã€ç„¡è¦–ファイルä¸ã®ã‚³ãƒ¡ãƒ³ãƒˆã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ã€‚
#ã§å§‹ã¾ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’無視ã—ãŸã„å ´åˆã¯ã€"RE:"プレフィックスを使ã£ã¦ãã ã•ã„。 , ヘッダーãŒå£Šã‚Œã¦ã„るよã†ã§ã™ã€‚-r -1を指定ã—ã¦æœ€çµ‚コミット時点ã®çŠ¶æ…‹ã«æˆ»ã—ã¦ãã ã•ã„。 --afterã¨--autoã‚’åŒæ™‚ã«æŒ‡å®šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 --benchmarkã¯ã€bzr2.2以é™ã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。ã‹ã‚ã‚Šã«bzr-usertestを使用ã—ã¦ãã ã•ã„。 --dry-runã¯--autoã¨ã¨ã‚‚ã«æŒ‡å®šã—ã¦ãã ã•ã„。 --dry-run を指定ã™ã‚‹ã¨ã€ã©ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒè¿½åŠ ã•ã‚Œã‚‹ã‹ã‚’表示ã—ã¾ã™ãŒã€å®Ÿéš›ã«è¿½åŠ ã¯
ã—ã¾ã›ã‚“。 --emailã¯ã€ç¾åœ¨ã®IDを表示ã™ã‚‹ãŸã‚ã ã‘ã«ä½¿ç”¨ã§ãã¾ã™ã€‚ --exclude-common-ancestryã«ã¯ã€-rã§2ã¤ã®ãƒªãƒ“ジョンを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ --file-ids-fromを指定ã™ã‚‹ã¨ã€æŒ‡å®šã•ã‚ŒãŸãƒ‘スã‹ã‚‰å¾—ãŸãƒ•ã‚¡ã‚¤ãƒ«IDを使ãŠã†ã¨
ã—ã¾ã™ã€‚対応ã™ã‚‹è¦ªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªå†…ã®åŒã˜åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ãƒ•ã‚¡ã‚¤ãƒ«IDを探ã—ã€
ç„¡ã‘ã‚Œã°ç´”粋ãªãƒ‘スã‹ã‚‰ç”Ÿæˆã—ã¾ã™ã€‚ã“ã®ã‚ªãƒ—ションãŒå¿…è¦ã«ãªã‚‹ã“ã¨ã¯ã»ã¨ã‚“ã©
ã‚ã‚Šã¾ã›ã‚“ãŒã€åŒã˜ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã€ã„ãšã‚Œãƒžãƒ¼ã‚¸ã™ã‚‹äºˆå®šã®ï¼’ã¤ã®ãƒ–ランãƒã«è¿½åŠ ã™ã‚‹
å ´åˆã«ä¾¿åˆ©ã§ã™(マージã®æ™‚ã®è¡çªã‚’é¿ã‘られã¾ã™)。ã¾ãŸã€åˆ¥ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã‚’サブ
ディレクトリã¨ã—ã¦ãƒžãƒ¼ã‚¸ã™ã‚‹æ™‚ã«ã‚‚便利ã§ã™ã€‚ --help, -h ヘルプを表示ã—ã¾ã™ã€‚
--verbose, -v より詳細ãªæƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚
--quiet, -q エラーやè¦å‘Šã ã‘を表示ã—ã¾ã™ã€‚ --prefix ã¯ï¼’ã¤ã®å€¤ã‚’コãƒãƒ³ã§åŒºåˆ‡ã£ãŸã‚‚ã®ã«ã—ã¦ãã ã•ã„。 (例 "old/:new/") --tree 㨠--revision ã¯åŒæ™‚ã«æŒ‡å®šã§ãã¾ã›ã‚“ 作æ¥ãƒ„リーã«å¯¾ã—ã¦ã¯--uncommittedを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ --verboseを指定ã™ã‚‹ã¨å„プラグインã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆã®ãƒ‘スãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ :ãƒã‚§ãƒƒã‚¯: :作者ã®å¤‰æ›´: :例: :例:
ブランãƒã ã‘ã‚’ã‚‚ã¤ãƒªãƒã‚¸ãƒˆãƒªã‚’作æˆã—ã¾ã™ã€‚:: :例:
トップレベルã®Makefileを無視ã™ã‚‹:: :例:
ã™ã¹ã¦ã®è¡çªã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒžãƒ¼ã‚¸ã‚’ã‚„ã‚Šç›´ã—ã€é€šå¸¸ã®THISã€OTHERã®
テã‚ストã«ãã‚ãˆã¦è¡çªã—ãŸé ˜åŸŸã®ãƒ™ãƒ¼ã‚¹ãƒ†ã‚ストを表示ã—ã¾ã™ã€‚:: :例:
ç¾åœ¨ã®ã‚¨ã‚¤ãƒªã‚¢ã‚¹ã‚’表示ã—ã¾ã™ã€‚:: :例:
ç¾åœ¨ã®ãƒ¦ãƒ¼ã‚¶ã®Eメールを表示ã—ã¾ã™ã€‚:: :例:
最新ã®ã‚³ãƒŸãƒƒãƒˆã¨ä½œæ¥ãƒ„リーã¨ã®é–“ã®å¤‰æ›´ã‚’表示ã—ã¾ã™ã€‚:: :例:
bzr.devã‹ã‚‰å…¨ã¦ã®æ–°ã—ã„リビジョンをマージã—ã¾ã™ã€‚:: :Exit values:
1 - 変更ã‚ã‚Š
2 - 表示ã§ããªã„変更
3 - エラー
0 - 変更ãªã— :注æ„:
*シェルã®ãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ãƒ‰ã‚’ãµãむ無視パターンを指定ã™ã‚‹ã¨ãã«ã¯ã€Unixシェル
ã«ã‚ˆã‚‹å¼•ç”¨ç¬¦ã§ããã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ :è¡¨ç¤ºé †ã®ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«: :ãã®ä»–ã®ãƒ•ã‚£ãƒ«ã‚¿ãƒªãƒ³ã‚°: :出力ã®ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«: :パスã®ãƒ•ã‚£ãƒ«ã‚¿ãƒªãƒ³ã‚°: :リビジョンã®ãƒ•ã‚£ãƒ«ã‚¿ãƒªãƒ³ã‚°: :部分的ãªã‚³ãƒŸãƒƒãƒˆ: :ç‰¹è¨˜äº‹é …: :Tips & tricks: :使ã„æ–¹:
%s
:使ã„æ–¹: %s
変æ›ã‚’開始ã—ãŸã¨ãã«ã€ backup.bzr.~#~ ã¨ã„ã†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒä½œæˆã•ã‚Œã¾ã™ã€‚
(#ã¯é€£ç•ªã§ã™) デフォルトã§ã¯ã€ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã¯å¤‰æ›å¾Œã‚‚残りã¾ã™ã€‚ã‚‚ã—変æ›ãŒ
失敗ã—ãŸã‚‰ã€æ–°ã—ã„.bzrフォルダを削除ã—ã¦ã€ã“ã®ãƒ•ã‚©ãƒ«ãƒ€ã‚’å…ƒã®åå‰ã«æˆ»ã—ã¦
ãã ã•ã„。--cleanオプションを指定ã™ã‚‹ã¨ã€å¤‰æ›ãŒæˆåŠŸã—ãŸã‚‰backup.bzr
ディレクトリã¯å‰Šé™¤ã•ã‚Œã¾ã™ã€‚ãã†ã§ãªã„å ´åˆã¯ã€å¤‰æ›å¾Œç‰¹ã«å•é¡ŒãŒãªã‘ã‚Œã°æ‰‹ã§
削除ã—ã¦ãã ã•ã„。 ãƒã‚¹ãƒˆã—ãŸãƒ„リーãŒã‚ã£ãŸå ´åˆã€æ˜Žç¤ºçš„ã«ç„¡è¦–ã—ãªã„é™ã‚Šè¦å‘Šã‚’表示ã—ã¾ã™ã€‚ 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚„ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’è¿½åŠ ã—ã¾ã™ã€‚ 親ディレクトリãŒãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ ã—よã†ã¨ã—ãŸå ´åˆã€è‡ªå‹•çš„ã«
親ディレクトリやã€ãã®ã•ã‚‰ã«ä¸Šä½ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚‚è¿½åŠ ã•ã‚Œã¾ã™ã€‚ã¤ã¾ã‚Šã€
ディレクトリを明示的ã«è¿½åŠ ã™ã‚‹å¿…è¦ã¯ãªãã€ãã®ä¸ã«ã‚ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ ã™ã‚Œã°
ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚‚è¿½åŠ ã•ã‚Œã‚‹ã¨ã„ã†ã“ã¨ã«ãªã‚Šã¾ã™ã€‚ ã•ã‚‰ã«ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ã€å®Ÿè¡Œå¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«ã«ã¤ã„ã¦ã¯ã€
末尾ã«ç¨®åˆ¥ã‚’ç¾ã™æ–‡å—ã¨ã—ã¦ãã‚Œãžã‚Œ'/'ã€'@'ã€'*'ãŒä»˜åŠ ã•ã‚Œã¾ã™ã€‚
ã“れを表示ã—ãªã„よã†ã«ã™ã‚‹ã«ã¯ã€'--no-classify'オプションを指定ã—ã¦ãã ã•ã„。 代ã‚ã‚Šã«ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸€è¦§ã ã‘を表示ã™ã‚‹ã«ã¯:: ãã‚Œãžã‚Œã®ã‚³ãƒŸãƒƒãƒˆã«ã€ãã®å†…容を説明ã™ã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
ã“ã‚Œã¯ã€--messageオプションã§æŒ‡å®š(コマンドラインã‹ã‚‰ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å–å¾—)ã—ãŸã‚Šã€
--fileオプションã§æŒ‡å®š(ファイルã‹ã‚‰ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å–å¾—)ã—ã¾ã™ã€‚ã©ã¡ã‚‰ã®ã‚ªãƒ—ションも
指定ã•ã‚Œã¦ã„ãªã„å ´åˆã¯ã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’入力ã™ã‚‹ãŸã‚ã®ã‚¨ãƒ‡ã‚£ã‚¿ãŒèµ·å‹•ã—ã¾ã™ã€‚
エディタã«ãƒãƒ¼ãƒ‰ã•ã‚Œã‚‹å®šåž‹æ–‡ã®ä¸ã«å¤‰æ›´ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®æƒ…å ±ã‚’å«ã‚ã‚‹ãŸã‚ã«ã¯ã€
--show-diffオプションを使用ã—ã¾ã™ã€‚ 無視パターンã«ãƒžãƒƒãƒã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€æ˜Žç¤ºçš„ã«æŒ‡å®šã•ã‚Œãªã„é™ã‚Šè¿½åŠ ã¯
ã•ã‚Œã¾ã›ã‚“。 便利ãªå½¢ã§è¡¨ç¤ºã™ã‚‹ãŸã‚ã®ãƒ•ã‚£ãƒ«ã‚¿ã‚’é©ç”¨ã—ã¾ã™ã€‚ 使ã„ã‚„ã™ã„å½¢ã§ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã™ã‚‹ãŸã‚ã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„フィルターをé©ç”¨ã—ã¾ã™ã€‚ ブランãƒã®å¤‰æ›´ã§ã¯ãªãã€ä½œæ¥ã‚³ãƒ”ー上ã®ã‚³ãƒŸãƒƒãƒˆã—ã¦ã„ãªã„変更をマージã—ã¾ã™ã€‚ åŒæ™‚ã«ã€ãƒ‡ã‚£ã‚¹ã‚¯ã‚¹ãƒšãƒ¼ã‚¹ã®ç¯€ç´„やパフォーマンスã®å‘上ã®ãŸã‚ã«ã€ãƒ‡ãƒ¼ã‚¿ã®
å†åœ§ç¸®ãŒã‹ã‹ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ 作者 変åを自動的ã«æŽ¨æ¸¬ã—ã¾ã™ã€‚ 変åを推測ã™ã‚‹æ™‚ã«ã€å®Ÿéš›ã«ã¯å¤‰æ›´ã‚’è¡Œã„ã¾ã›ã‚“。 変更ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã—ã¾ã™ã€‚ オプション "%(name)s" ã«å¯¾ã™ã‚‹ä¸æ£ãªå€¤ "%(value)s" Bazaarã¯ã€ã‚°ãƒãƒ¼ãƒãƒ«ãªç„¡è¦–ファイル ~/.bazaar/ignore もサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™ã€‚
Windowsã§ã¯ã€ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯Application Data ディレクトリã«ã‚ã‚Šã¾ã™ã€‚
(C:\Documents and Settings\<user>\Application Data\Bazaar\2.0\ignore)
ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã§ç·¨é›†ã™ã‚‹ã“ã¨ã¯ã§ããªã„ã®ã§ã€ç›´æŽ¥ã‚¨ãƒ‡ã‚£ã‚¿ã§ç·¨é›†
ã—ã¦ãã ã•ã„。 マージãŒã‚³ãƒŸãƒƒãƒˆã•ã‚Œã‚‹å‰ã«ã¯ã€ãƒžãƒ¼ã‚¸ä¸ã®TipリビジョンãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚
ã™ã¹ã¦ã®ãƒžãƒ¼ã‚¸ä¸ãƒªãƒ“ジョンを表示ã™ã‚‹ã«ã¯ã€-vオプションを使用ã—ã¾ã™ã€‚
マージä¸ã®æƒ…å ±ã‚’çœç•¥ã™ã‚‹ã«ã¯ã€no-pendingオプションを使用ã™ã‚‹ã‹ã€
ファイルやディレクトリを指定ã—ã¦ãã ã•ã„。 æ–°ã—ã„ブランãƒã‚’å…ƒã®ãƒ–ランãƒã«ãƒã‚¤ãƒ³ãƒ‰ã—ã¾ã™ã€‚ ãƒã‚¤ãƒ³ãƒ‰ã•ã‚ŒãŸãƒ–ランãƒã¯ã€ãƒãƒ¼ã‚«ãƒ«ã§ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ãŒè¨å®šã•ã‚Œã¦ã„ãªã‘ã‚Œã°
マスタブランãƒã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ を使用ã—ã¾ã™ã€‚ ブランãƒãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ 作æ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªä»¥å¤–ã«ãƒžãƒ¼ã‚¸ã™ã‚‹å ´åˆã®ã€ãƒžãƒ¼ã‚¸å…ˆã®ãƒ–ランãƒã€‚ 作æ¥ãƒ•ã‚©ãƒ«ãƒ€ã®ä»£ã‚ã‚Šã«pullã‚’å—ã‘入れるブランムカレントディレクトリã®ä»£ã‚ã‚Šã«pushå…ƒã¨ã™ã‚‹ãƒ–ランãƒã‚’指定ã—ã¾ã™ã€‚ 比較元ã®ãƒ–ランãƒ/作æ¥ãƒ„リーã§ã™ã€‚ 比較先ã®ãƒ–ランãƒ/作æ¥ãƒ„リーã§ã™ã€‚ %d個ã®ãƒªãƒ“ジョンをブランãƒã—ã¾ã—ãŸã€‚ ブランãƒã¨ä½œæ¥ãƒ„リーã«ã¤ã„ã¦ã¯ã€å˜åœ¨ã—ãªã„リビジョンã«ã¤ã„ã¦ã‚‚表示ã•ã‚Œã¾ã™ã€‚ ブランãƒã¯æœ€æ–°ã§ã™ã€‚
リãƒã‚¸ãƒˆãƒªå†…ã®ãƒ–ランãƒã«ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ä½œæ¥ãƒ„リーをæŒãŸã›ã¾ã›ã‚“。 デフォルトã§ã¯ã€branchå…ˆã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒæ—¢ã«å˜åœ¨ã—ã¦ã„ã‚‹ã®ã«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚Œã¦ã„ãªã„å ´åˆã¯branchã§ãã¾ã›ã‚“。ã“ã®ãƒ•ãƒ©ã‚°ã‚’指定ã™ã‚‹ã¨ã€ãã®å ´åˆã§ã‚‚branchã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚ デフォルトã§ã¯ã€pushå…ˆã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒæ—¢ã«å˜åœ¨ã—ã¦ã„ã‚‹ã®ã«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚Œã¦ã„ãªã„状態ã®å ´åˆã¯pushã§ãã¾ã›ã‚“。ã“ã®ãƒ•ãƒ©ã‚°ã‚’指定ã™ã‚‹ã¨ã€ãã®å ´åˆã§ã‚‚pushã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚ デフォルトã§ã¯ã€ãƒ„リー全体ãŒã‚³ãƒŸãƒƒãƒˆã•ã‚Œã€ã‚³ãƒŸãƒƒãƒˆã‚’実行ã—ãŸäººãŒè‘—者ã«ãªã‚Šã¾ã™ã€‚
ã“ã‚Œã¯ã€ä»¥ä¸‹ã®ã‚ˆã†ãªæ–¹æ³•ã§ä¸Šæ›¸ãã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ デフォルトã§ã¯ã€ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯åˆ†å²ã—ã¦ã„ãªã„ブランãƒã§ã®ã¿å®Ÿè¡Œã§ãã¾ã™ã€‚
対象ã®ãƒ–ランãƒã®æœ€æ–°ã‚³ãƒŸãƒƒãƒˆãŒã¾ã (直接的ã¾ãŸã¯é–“接的ã«)親ブランãƒã«ãƒžãƒ¼ã‚¸
ã•ã‚Œã¦ã„ãªã‘ã‚Œã°ã€ãƒ–ランãƒãŒåˆ†å²ã—ã¦ã„ã‚‹ã¨ã¿ãªã—ã¾ã™ã€‚ è¡çªã®ç¸®å°åŒ–ã€ãƒ™ãƒ¼ã‚¹ã®è¡¨ç¤ºãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ ファイルを個別ã«pullã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 --verboseã¨--nullã‚’åŒæ™‚ã«æŒ‡å®šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 --uncommittedã¨--revisionã‚’åŒæ™‚ã«æŒ‡å®šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 ãƒãƒ³ãƒ‰ãƒ«ã€ãƒžãƒ¼ã‚¸ãƒ‡ã‚£ãƒ¬ã‚¯ãƒ†ã‚£ãƒ–ã«å¯¾ã—ã¦--uncommittedを指定ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 マージディレクティブやãƒãƒ³ãƒ‰ãƒ«ã«å¯¾ã—ã¦-rを使用ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 ç¾åœ¨ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«é–¢é€£ã—ãŸãƒ–ランãƒã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ã€‚ ç¾åœ¨ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«é–¢é€£ã—ãŸãƒªãƒã‚¸ãƒˆãƒªã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ã€‚ ç¾åœ¨ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«é–¢é€£ã—ãŸä½œæ¥ãƒ„リーをãƒã‚§ãƒƒã‚¯ã™ã‚‹ã€‚ 変更を新ã—ã„リビジョンã«ã‚³ãƒŸãƒƒãƒˆã™ã‚‹ã€‚ 何も変更ã•ã‚Œã¦ã„ãªãã¦ã‚‚コミットã™ã‚‹ã€‚ 作æ¥ãƒ„リーã«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚‹ãŸã‚ã€ã‚³ãƒŸãƒƒãƒˆãŒæ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚ リãƒã‚¸ãƒˆãƒªå†…ã®ãƒ‡ãƒ¼ã‚¿ã‚’圧縮ã™ã‚‹ã€‚ è¨å®šãƒ•ã‚¡ã‚¤ãƒ« %(filename)s ㌠UTF-8 ã§ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã•ã‚Œã¦ã„ã¾ã›ã‚“
è¡çªã®ç¸®å°åŒ–ã¯ã€ã“ã®ãƒžãƒ¼ã‚¸ã‚¿ã‚¤ãƒ—ã§ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã›ã‚“。 %s 作æ¥ãƒ„リーã«ç«¶åˆãŒã‚ã‚Šã¾ã™ã€‚"bzr conflicts" ã§è¡¨ç¤ºã—ã¦ã€"bzr resolve FILE"ã§è§£æ¶ˆã—ã¦ãã ã•ã„。 接続ãŒã‚¿ã‚¤ãƒ アウトã—ã¾ã—ãŸ: %(msg)s%(orig_error)s 接続ãŒé–‰ã˜ã‚‰ã‚Œã¾ã—ãŸ: %(msg)s %(orig_error)s å‚照先ã®ãƒ–ランãƒã‚’特定ã§ãã¾ã›ã‚“。 移動ã§ãã¾ã›ã‚“。 %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s --commit-timeをパースã§ãã¾ã›ã‚“。: %(from_path)s%(operator)s ã‹ã‚‰ %(to_path)s%(_has_extra)s%(extra)s ã¸ãƒªãƒãƒ¼ãƒ ã§ãã¾ã›ã‚“ 作æ¥ãƒ„リーをもãŸãªã„ブランãƒã‚’作æˆã—ã¾ã™ã€‚ 作æ¥ãƒ„リーã®ãªã„ブランãƒã‚’作æˆã—ã¾ã™ã€‚ æ—¢å˜ã®ãƒ–ランãƒã‚’コピーã—ã¦æ–°ã—ã„ブランãƒã‚’作æˆã—ã¾ã™ã€‚ æ—¢å˜ã®ãƒ–ランãƒã®ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã‚’æ–°ã—ã作æˆã—ã¾ã™ã€‚ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作æˆã—ã¾ã™ã€‚ ブランãƒã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã‚’共有ã™ã‚‹ãŸã‚ã®å…±æœ‰ãƒªãƒã‚¸ãƒˆãƒªã‚’作æˆã—ã¾ã™ã€‚ å…ƒã®ãƒ–ランãƒã‚’å‚ç…§ã™ã‚‹ã‚¹ã‚¿ãƒƒã‚¯ãƒ‰ãƒ–ランãƒã‚’作æˆã—ã¾ã™ã€‚æ–°ã—ã„ブランãƒã§ã¯ã€å…ƒã®ãƒ–ランãƒã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã‚‹ã¨ãã—ã‹æ“作ã§ãã¾ã›ã‚“。 親ブランãƒã®å…¬é–‹ã•ã‚ŒãŸå ´æ‰€ã‚’å‚ç…§ã™ã‚‹ã‚¹ã‚¿ãƒƒã‚¯ãƒ‰ãƒ–ランãƒã‚’作æˆã—ã¾ã™ã€‚ コミットã®å±¥æ´ã‚’別ã®ãƒ–ランãƒã‹ã‚‰å‚ç…§ã™ã‚‹ã‚¹ã‚¿ãƒƒã‚¯ãƒ‰ãƒ–ランãƒã‚’作æˆã—ã¾ã™ã€‚å‚照先ã®ãƒ–ランãƒã«ãªã„変更ã ã‘ãŒã“ã®ãƒ–ランãƒã«å«ã¾ã‚Œã¾ã™ã€‚ ブランãƒã¾ã§ã®ãƒ‘スãŒå˜åœ¨ã—ã¦ã„ãªã‘ã‚Œã°ã€ä½œæˆã—ã¾ã™ã€‚ {0}を作æˆã—ã¾ã—ãŸã€‚(フォーマット:{1})
%s ã‚’å‚ç…§ã™ã‚‹ã‚¹ã‚¿ãƒƒã‚¯ãƒ‰ãƒ–ランãƒã‚’作æˆã—ã¾ã—ãŸã€‚ グラフ %(graph)r ãŒãƒ«ãƒ¼ãƒ—ã—ã¦ã„ã¾ã™ã€‚ å…ƒã«æˆ»ã›ãªã„ファイルã€ç©ºã§ã¯ãªã„ディレクトリもå«ã‚ã¦ã€æŒ‡å®šã•ã‚ŒãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’å…¨ã¦å‰Šé™¤ã—ã¾ã™ã€‚(廃æ¢äºˆå®šã€‚no-backupを使用ã—ã¦ãã ã•ã„) Bazaarã‹ã‚‰ã¯å‰Šé™¤ã—ã¾ã™ãŒã€ä½œæ¥ãƒ„リーã«ã¯æ®‹ã—ã¾ã™ã€‚ å¤ã„パックファイルを削除ã—ã€ãƒ‡ã‚£ã‚¹ã‚¯å®¹é‡ã‚’節約ã™ã‚‹ã€‚ 削除モード æ–°ã—ã„リビジョンã®èª¬æ˜Žã€‚ Diffフォーマット 使用ã™ã‚‹Diffフォーマットã§ã™ã€‚ ãƒãƒ¼ã‚«ãƒ«ãƒ–ランãƒã®å¤‰æ›´ã®ã¿ã‚’表示ã™ã‚‹ã€‚ リモートブランãƒã®å¤‰æ›´ã®ã¿ã‚’表示ã™ã‚‹ã€‚ Eメールアドレスã ã‘を表示ã—ã¾ã™ã€‚ より詳細ãªæƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚ 共通ã®å…ˆç¥–ã«å«ã¾ã‚Œãªã„リビジョンã ã‘を表示(-rX..Yを使用ã™ã‚‹å¿…è¦ãŒã‚ã‚‹) ステータスã®ã‚µãƒžãƒªãƒ¼ã‚’表示ã—ã¾ã™ã€‚ bzrãŒä½¿ç”¨ã™ã‚‹ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ç„¡è¦–ルールを表示ã—ã¾ã™ã€‚ 指定ã•ã‚ŒãŸãƒ‘スã®å¤‰æ›´ã‚’無視ã—ã¾ã™ã€‚ オブジェクトã®ç¨®åˆ¥ã‚’表ã™ãƒžãƒ¼ã‚«ãƒ¼ã‚’表示ã—ã¾ã›ã‚“。 複数ã®è¦ªã‚’æŒã¤ã‚³ãƒŸãƒƒãƒˆã‚’表示ã—ãªã„ リãƒãƒ¼ãƒˆã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—を作æˆã—ãªã„。 共有リãƒã‚¸ãƒˆãƒªãŒä½¿ãˆã‚‹å ´åˆã§ã‚‚ã€å…±æœ‰ãƒªãƒã‚¸ãƒˆãƒªã‚’使ã„ã¾ã›ã‚“。 変更ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã—ã¾ã›ã‚“。 作æ¥ã‚³ãƒ”ーを更新ã§ãるプãƒãƒˆã‚³ãƒ«ã‚’使ã£ã¦ã„ã‚‹å ´åˆã§ã‚‚ã€æ›´æ–°ã—ã¾ã›ã‚“。 ディレクトリã®å†…容をå†å¸°çš„ã«è¿½åŠ ã—ã¾ã›ã‚“。 マージä¸ã®æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã›ã‚“。 パックæ“作ä¸ã« bazaar ã¯æ—¢å˜ã®ãƒªãƒã‚¸ãƒˆãƒªãƒ‡ãƒ¼ã‚¿ã€
ã™ãªã‚ã¡ãƒ‘ックファイルã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã‚’ã¨ã‚Šã¾ã™ã€‚
ã“ã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã¯å®‰å…¨ã«å‰Šé™¤ã§ãるよã†ã«ãªã‚‹ã¨ã€
bazaar ã«ã‚ˆã£ã¦æœ€çµ‚çš„ã«ã¯è‡ªå‹•çš„ã«å‰Šé™¤ã•ã‚Œã¾ã™ã€‚
ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã•ã‚ŒãŸãƒ‘ックファイルを削除ã—ã€
ディスク容é‡ã‚’節約ã—ãŸã„å ´åˆã«ã¯ --clean-obsolete-packs
オプションをã”利用ãã ã•ã„。 空ã®ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸã€‚--messageã‹--fileã§ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’指定ã™ã‚‹ã‹ã€--message ""ã§ç©ºãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’指定ã—ã¦ãã ã•ã„。 è¨å®šãƒ•ã‚¡ã‚¤ãƒ« %(filename)s ã®ãƒ‘ースエラー:
%(errors)s 最新ã€ã¾ãŸã¯éŽåŽ»ã®ãƒªãƒ“ジョンを指定ã•ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚‚ã—ãã¯ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã«ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã™ã‚‹ã€‚ エクスãƒãƒ¼ãƒˆãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ %(format)r ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“ 最終リビジョンã§ã¯ãªãã€ä½œæ¥ãƒ„リーã®å†…容をエクスãƒãƒ¼ãƒˆã—ã¾ã™ã€‚ "%(command_line)s" コマンドã§ã®GPGサインã«å¤±æ•—ã—ã¾ã—㟠%(from_path)s ã‹ã‚‰ %(to_path)s ã¸ã®ãƒªãƒãƒ¼ãƒ ã«å¤±æ•—ã—ã¾ã—ãŸ: %(why)s GPGã‚·ã‚°ãƒãƒãƒ£ã®æ¤œè¨¼ã« "%(error)s" ã§å¤±æ•—ã—ã¾ã—ãŸã€‚ %(filename)s ã¯è¡çªã—ã¦ã„ã¾ã›ã‚“ ファイルを別ã®ãƒ–ランãƒã«ç§»å‹•ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 アップグレードã«é–¢ã™ã‚‹è©³ç´°ãªæƒ…å ±ã¯ã€Bazaar Upgrade Guideã‚’ã”覧ãã ã•ã„。
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/. bzr 2.0 シリーズã®ãŸã‚ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã€‚
group-compress ストレージを利用ã—ã¾ã™ã€‚
rich root 機能をæä¾›ã—ã¾ã™ã€‚ rich root 機能をæä¾›ã™ã‚‹ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«å¤‰æ›ã™ã‚‹ã¨ã€
rich root 機能をæŒãŸãªã„フォーマットã«æˆ»ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。
フォーマットã¯tarã€tgzã€tbz2ã®ã‚ˆã†ãªâ€exporterâ€ã®åå‰ã«ãªã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
何も渡ã•ã‚Œãªã‘ã‚Œã°ã€æ‹¡å¼µåã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’見ã¤ã‘よã†ã¨ã—ã¾ã™ã€‚ æ‹¡å¼µåãŒãªã„
å ´åˆã¯ã€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã—ã¾ã™(–format=dirã¨åŒç‰)。 ファイルã®å†…容をã“ã®ãƒ„リーã‹ã‚‰å–å¾—ã—ã¾ã™ã€‚ %(path)s ã« HTTP MIME 境界ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: %(msg)s å¯èƒ½ãªã‚‰ã€ä½œæ¥ã‚³ãƒ”ーをãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ã—ã¾ã™ã€‚ BRANCH_LOCATIONãŒæŒ‡å®šã•ã‚Œã¦ã„ãªã„å ´åˆã¯ã€'.'ã«ã‚るブランãƒã‚’å†æ§‹æˆã—ã¾ã™ã€‚
ã“ã‚Œã¯ã€ä½œæ¥ãƒ„リーを消ã—ã¦ã—ã¾ã£ãŸå ´åˆã‚„ã€ãã‚‚ãも作æ¥ãƒ„リーãŒä½œæˆã•ã‚Œã¦
ã„ãªã„å ´åˆ(例ãˆã°ã€SFTPã§pushã•ã‚ŒãŸãƒ–ランãƒãªã©)ã«å½¹ç«‹ã¡ã¾ã™ã€‚ OLDNAMEãŒãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã«å˜åœ¨ã›ãšã€ã‹ã¤ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†å¯¾è±¡ã«
ãªã£ã¦ã„ã¦ã€NEWNAMEã¯ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã«å˜åœ¨ã—ã¦ã„ã‚‹ãŒãƒãƒ¼ã‚¸ãƒ§ãƒ³
管ç†å¯¾è±¡ã«ã¯ãªã£ã¦ã„ãªã„å ´åˆã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«æ‰‹å‹•ã§ç§»å‹•æ¸ˆã¿ã ã¨ã¿ãªã—ã€
内部データã¸ã®å¤‰æ›´ã®åæ˜ ã ã‘ã‚’è¡Œã„ã¾ã™ã€‚
複数ã®SOURCEã‚’ã²ã¨ã¤ã®DESTINATIONã«ç§»å‹•ã™ã‚‹å ´åˆã‚‚åŒã˜ã§ã™ã€‚ .bzrignoreファイルãŒå˜åœ¨ã—ãªã„å ´åˆã¯ã€ignoreコマンドã¯ãれを作æˆã—ã¦ã€
指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚„ãƒ‘ã‚¿ãƒ¼ãƒ³ã‚’è¿½åŠ ã—ã¾ã™ã€‚ã¾ãŸã€.bzrignoreファイルã¯
ignoreコマンドã§è‡ªå‹•çš„ã«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã«è¿½åŠ ã•ã‚Œã¾ã™ã€‚ignoreコマンドを
使ã‚ãšã«.bzrignoreファイルを手ã§ä½œæˆã—ãŸå ´åˆã¯ã€æ˜Žç¤ºçš„ã«addコマンドを
呼ã¶å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ ２番目ã®ãƒ–ランãƒãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€ã‚¯ãƒã‚¹ãƒ–ランãƒä¿®å¾©ã‚’è¡Œã„ã¾ã™ã€‚
ã“ã‚Œã¯ã€ãƒ„リーã®ãƒ«ãƒ¼ãƒˆIDã®ã‚ˆã†ãªã€éžå¸¸ã«å¤ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®Bzrã«ã¯ãªã‹ã£ãŸ
データãŒã€ä¸¡æ–¹ã®ãƒ–ランãƒã«æ£ã—ã表ç¾ã•ã‚Œã¦ã„ã‚‹ã‹ã‚’ãƒã‚§ãƒƒã‚¯ã—ã¾ã™ã€‚ ブランãƒãŒçœç•¥ã•ã‚Œã‚‹ã¨ç¾åœ¨ã®ä½œæ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’å«ã‚€ãƒ–ランãƒãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ ブランãƒãŒåˆ†å²ã—ã¦ã„ã‚‹å ´åˆã€ãã®å¤‰æ›´ã‚’片方ã‹ã‚‰ã‚‚ã†ç‰‡æ–¹ã«çµ±åˆã™ã‚‹ãŸã‚ã«
'bzr merge'を使用ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ブランãƒã‚’マージã™ã‚Œã°ã€ã¾ãŸpullã§ãã‚‹
よã†ã«ãªã‚‹ã¯ãšã§ã™ã€‚ ブランãƒåŒå£«ãŒåˆ†å²ã—ã¦ã„ã‚‹å ´åˆã€ 'bzr push --overwrite' ã§ã€ã¾ã マージã•ã‚Œã¦
ã„ãªã„å¤‰æ›´ã‚’ç ´æ£„ã—ã¦pushå…ˆã®ãƒ–ランãƒã‚’完全ã«ç½®ãã‹ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ 引数ãŒæŒ‡å®šã•ã‚Œãªã‹ã£ãŸå ´åˆã¯ã€ç¾åœ¨ã®ãƒ„リーã®ã™ã¹ã¦ã®å¤‰æ›´ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚
ファイルãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€ãã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´ã ã‘ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚
リモートブランãƒã‚„ã€è¤‡æ•°ã®ãƒ–ランãƒã‚’ -oldã¨-newオプションã§æŒ‡å®šã™ã‚‹ã“ã¨ãŒ
ã§ãã¾ã™ã€‚ã“れらãŒæŒ‡å®šã•ã‚Œã¦ã„ãªã„å ´åˆã¯æœ€åˆã®å¼•æ•°ãŒä½¿ã‚ã‚Œã€å¼•æ•°ãŒç„¡ã„
å ´åˆã¯ä½œæ¥ãƒ„リーãŒå¯¾è±¡ã«ãªã‚Šã¾ã™ã€‚ 何も引数を指定ã—ãªã„å ´åˆã€ä½œæ¥ã‚³ãƒ”ー全体ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚
指定ã—ãŸå ´åˆã¯ã€æŒ‡å®šã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚„ディレクトリã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã ã‘ãŒè¡¨ç¤º
ã•ã‚Œã¾ã™ã€‚ディレクトリを指定ã—ãŸå ´åˆã¯ã€ãã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®é…下ã®å…¨ã¦ã®
ファイルã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ æ¡ä»¶ãŒæŒ‡å®šã•ã‚Œãªã‘ã‚Œã°ã€æŒ‡å®šã•ã‚ŒãŸå ´æ‰€ã®å…¨ã¦ã®BazaarデータãŒ
ãƒã‚§ãƒƒã‚¯ã•ã‚Œã¾ã™ã€‚ リビジョンãŒæŒ‡å®šã•ã‚Œãªã‘ã‚Œã°ã€æœ€å¾Œã®ãƒªãƒ“ジョンãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ リビジョンãŒæŒ‡å®šã•ã‚Œãªã‘ã‚Œã°ã€æœ€çµ‚コミットã®ãƒªãƒ“ジョンをエクスãƒãƒ¼ãƒˆã—ã¾ã™ã€‚ コミット済ã¿ã®å¤‰æ›´ã§ã¯ãªãã€ä½œæ¥ãƒ„リー上ã§ã®å¤‰æ›´ã‚’別ã®ãƒ–ランãƒã«ãƒžãƒ¼ã‚¸ã—ãŸã„
å ´åˆã¯ã€--uncommittedオプションを指定ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ rootãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€ã‚³ãƒ³ãƒ†ãƒŠãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ(tarã€zipãªã©)ã®ãƒ«ãƒ¼ãƒˆ
ディレクトリã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚指定ã•ã‚Œã¦ã„ãªã„å ´åˆã¯ã€ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ
ファイルåãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã«ãªã‚Šã¾ã™ã€‚rootオプションã¯ã€'dir'フォーマット
ã«å¯¾ã—ã¦ã¯ä½œç”¨ã—ã¾ã›ã‚“。 --no-treesオプションãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€ãƒªãƒã‚¸ãƒˆãƒªå†…ã«ä½œæˆã•ã‚ŒãŸãƒ–ランãƒ
ã«ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ä½œæ¥ãƒ„リーãŒã§ãã¾ã›ã‚“。ディスク上ã«ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ã—ã¦ã¯
ã‚ã‚Šã¾ã™ãŒã€ç‰¹å®šãƒªãƒ“ジョンã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚³ãƒ”ーを個々ã«æŒã¤ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。
ã“ã‚Œã¯ã€ã‚µãƒ¼ãƒãƒ¼ä¸Šã®ãƒªãƒã‚¸ãƒˆãƒªãªã©ã€ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã‚„リモートブランãƒã¨ã‚„ã‚Šã¨ã‚Š
ã™ã‚‹ãƒªãƒã‚¸ãƒˆãƒªã®å ´åˆã«å½¹ç«‹ã¡ã¾ã™ã€‚ TO_LOCATIONãŒæŒ‡å®šã•ã‚Œã¦ã„ãªã„å ´åˆã¯ã€BRANCH_LOCATIONã®æœ€å¾Œã®ãƒ‘ーツãŒä½¿ã‚ã‚Œ
ã¾ã™ã€‚ã¤ã¾ã‚Šã€"checkout ../foo/bar"ã¨ã—ãŸå ´åˆã¯ã€.barãŒä½œã‚‰ã‚Œã¾ã™ã€‚
BRANCH_LOCATIONã«ã€ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ã‚„ãã®ç’°å¢ƒã®ãƒ‘スセパレータãŒå«ã¾ã‚Œã¦ã„ãªã„å ´åˆã¯
BRANCH_LOCATIONã‹ã‚‰ã‚¹ã‚ーマやドライブã®IDã‚’å–り除ã„ãŸã‚‚ã®ãŒTO_LOCATIONã«ãªã‚Š
ã¾ã™ã€‚例ãˆã°ã€"branch lp:foo-bar"ã¨ã™ã‚‹ã¨ã€./foo-barãŒä½œã‚‰ã‚Œã¾ã™ã€‚ TO_LOCATIONãŒæŒ‡å®šã•ã‚Œã¦ã„ãªã„å ´åˆã¯ã€FROM_LOCATIONã®æœ€å¾Œã®ãƒ‘ーツãŒä½¿ã‚ã‚Œã¾ã™ã€‚
ã¤ã¾ã‚Šã€"branch ../foo/bar"ã¨ã—ãŸå ´åˆã¯ã€./barãŒä½œã‚‰ã‚Œã¾ã™ã€‚
FROM_LOCATIONã«ã€ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ã‚„ãã®ç’°å¢ƒã®ãƒ‘スセパレータãŒå«ã¾ã‚Œã¦ã„ãªã„å ´åˆã¯
FROM_LOCATIONã‹ã‚‰ã‚¹ã‚ーマやドライブã®IDã‚’å–り除ã„ãŸã‚‚ã®ãŒTO_LOCATIONã«ãªã‚Š
ã¾ã™ã€‚例ãˆã°ã€"branch lp:foo-bar"ã¨ã™ã‚‹ã¨ã€./foo-barãŒä½œã‚‰ã‚Œã¾ã™ã€‚ マージ先ã®ãƒªãƒ“ジョンãŒãƒžãƒ¼ã‚¸å…ƒã®ãƒ–ランãƒã«ã™ã¹ã¦å«ã¾ã‚Œã¦ã„ã‚‹å ´åˆã€ãƒžãƒ¼ã‚¸ã®
ã‹ã‚ã‚Šã«pullを実行ã—ã¾ã™ã€‚ãã®å ´åˆã¯ã€ã‚³ãƒŸãƒƒãƒˆã™ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。 最後ã®å¼•æ•°ãŒãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†å¯¾è±¡ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®å ´åˆã€æŒ‡å®šã•ã‚ŒãŸä»–ã®é …ç›®ã¯
ã™ã¹ã¦ãã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®ä¸ã«ç§»å‹•ã•ã‚Œã¾ã™ã€‚ãã†ã§ãªã„å ´åˆã¯ã€å¼•æ•°ã®æ•°ã¯
ï¼’ã¤ã§ãªã‘ã‚Œã°ãªã‚‰ãšã€ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ–°ã—ã„åå‰ã«å¤‰æ›´ã•ã‚Œã¾ã™ã€‚ 指定ã•ã‚ŒãŸå ´æ‰€ãŒå…±ç”¨ãƒªãƒã‚¸ãƒˆãƒªã®å ´åˆã€ãƒªãƒã‚¸ãƒˆãƒªã®å¤‰æ›ãŒæˆåŠŸã—ãŸã‚‰
é…下ã®ãƒ–ランãƒã‚‚変æ›ã•ã‚Œã¾ã™ã€‚ã‚‚ã—ブランãƒã®å¤‰æ›ã«å¤±æ•—ã—ã¦ã‚‚ã€ä»–ã®
ブランãƒã®å¤‰æ›ã¯ç¶šè¡Œã•ã‚Œã¾ã™ã€‚ 作æ¥ãƒ„リーã®ãƒ–ランãƒãŒãƒžã‚¹ã‚¿ãƒ¼ãƒ–ランãƒã«æŸç¸›ã•ã‚Œã¦ã„ã‚‹å ´åˆã€bzrã¯
作æ¥ãƒ„リーã®ãƒ–ランãƒã‚‚マスターブランãƒã®çŠ¶æ…‹ã«æ›´æ–°ã—ã¾ã™ã€‚ 作æ¥ãƒ„リーã«ã‚³ãƒŸãƒƒãƒˆã•ã‚Œã¦ã„ãªã„変更ãŒã‚ã£ãŸå ´åˆã€ãã®å¤‰æ›´ã¯ update 後も
コミットã•ã‚Œã¦ã„ãªã„変更ã¨ã—ã¦æ®‹ã‚Šã¾ã™ã€‚ã“れらã®å¤‰æ›´ã‚’å–り消ã™ã«ã¯ã€
'bzr revert' コマンドを利用ã—ã¦ãã ã•ã„。コミットã•ã‚Œã¦ã„ãªã„変更ã¯ã€ãƒ™ãƒ¼ã‚¹
リビジョンã®æ›´æ–°ã«ã‚ˆã‚‹å¤‰æ›´ã¨ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ 親ディレクトリã«ãƒªãƒã‚¸ãƒˆãƒªãŒã‚ã‚‹å ´åˆã¯ã€ãƒ–ランãƒå†…ã®å±¥æ´ã¯ãƒªãƒã‚¸ãƒˆãƒªã«
ä¿å˜ã•ã‚Œã¾ã™ã€‚ãã†ã§ãªã„å ´åˆã¯ã€å±¥æ´ã‚’.bzrディレクトリ内ã«æŒã¤ã‚¹ã‚¿ãƒ³ãƒ‰
ã‚¢ãƒãƒ³ãƒ–ランãƒãŒä½œæˆã•ã‚Œã¾ã™ã€‚ æ—¢ã«ãƒ–ランãƒãŒã‚ã£ã¦ã€ä½œæ¥ãƒ„リーãŒãªã„å ´åˆã¯ã€'bzr checkout'ã§ãƒ„リーを
生æˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ デフォルトブランãƒãŒè¨å®šã•ã‚Œã¦ã„ãªã„å ´åˆã€æœ€åˆã«ãƒžãƒ¼ã‚¸ã‚’実行ã—ãŸã¨ãã«
è¨å®šã•ã‚Œã¾ã™ã€‚(ã“れをã—ãªã„よã†ã«ã™ã‚‹ã«ã¯ã€--no-rememberを指定ã—ã¾ã™ã€‚)
ãã®å¾Œã¯ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒ–ランãƒã‚’使用ã™ã‚‹æ™‚ã«ã¯æŒ‡å®šã‚’çœç•¥ã§ãるよã†ã«ãªã‚Š
ã¾ã™ã€‚デフォルトを変更ã™ã‚‹ã«ã¯ã€--rememberを指定ã—ã¾ã™ã€‚ã“ã®å€¤ã¯ã€ãƒªãƒ¢ãƒ¼ãƒˆã®
ブランãƒã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããŸæ™‚ã ã‘ä¿å˜ã•ã‚Œã¾ã™ã€‚ デフォルトã®pull対象ブランãƒãŒè¨å®šã•ã‚Œã¦ã„ãªã„å ´åˆã¯ã€æœ€åˆã«pullã—ãŸæ™‚ã«
è¨å®šã•ã‚Œã¾ã™ã€‚(ã“れをã—ãªã„よã†ã«ã™ã‚‹ã«ã¯ã€--no-rememberを指定ã—ã¾ã™ã€‚)
ãã®å¾Œã¯ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒ–ランãƒã‚’使用ã™ã‚‹æ™‚ã«ã¯æŒ‡å®šã‚’çœç•¥ã§ãるよã†ã«ãªã‚Š
ã¾ã™ã€‚デフォルトを変更ã™ã‚‹ã«ã¯ã€--rememberを指定ã—ã¾ã™ã€‚ã“ã®å€¤ã¯ã€ãƒªãƒ¢ãƒ¼ãƒˆ
ブランãƒã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããŸæ™‚ã ã‘ä¿å˜ã•ã‚Œã¾ã™ã€‚ デフォルトã®push対象ブランãƒãŒè¨å®šã•ã‚Œã¦ã„ãªã„å ´åˆã¯ã€æœ€åˆã«pushã—ãŸæ™‚ã«
è¨å®šã•ã‚Œã¾ã™ã€‚(ã“れをã—ãªã„よã†ã«ã™ã‚‹ã«ã¯ã€--no-rememberを指定ã—ã¾ã™ã€‚)
ãã®å¾Œã¯ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒ–ランãƒã‚’使用ã™ã‚‹æ™‚ã«ã¯æŒ‡å®šã‚’çœç•¥ã§ãるよã†ã«ãªã‚Š
ã¾ã™ã€‚デフォルトを変更ã™ã‚‹ã«ã¯ã€--rememberを指定ã—ã¾ã™ã€‚ã“ã®å€¤ã¯ã€ãƒªãƒ¢ãƒ¼ãƒˆã®
ブランãƒã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããŸæ™‚ã ã‘ä¿å˜ã•ã‚Œã¾ã™ã€‚ 対象ã®ãƒªãƒ“ジョン以é™ã«ãƒ•ã‚¡ã‚¤ãƒ«ãŒæ–°ã—ãè¿½åŠ ã•ã‚Œã¦ã„ã‚‹å ´åˆã¯ã€ãã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯
削除ã•ã‚Œã¾ã™ã€‚削除ã•ã‚Œã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¤‰æ›´ã•ã‚Œã¦ã„ã‚‹å ´åˆã¯ã€ä¸Šè¨˜ã®é€šã‚Šã«
ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã•ã‚Œã¾ã™ã€‚ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å«ã‚€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯å‰Šé™¤ã•ã‚Œ
ã¾ã›ã‚“。 ã‚‚ã—ã€ï¼’ã¤ã®ãƒªãƒ“ジョンを指定ã—ãŸå ´åˆ("--revision BASE..OTHER")ã€BASEã‹ã‚‰
OTHERã®ç¯„囲(BASEã¯å«ã¾ãšã€OTHERã¯å«ã‚€)ã®ãƒªãƒ“ジョンãŒãƒžãƒ¼ã‚¸ã•ã‚Œã¾ã™ã€‚ã“ã‚Œã«
よã£ã¦ã‚¹ã‚ップã•ã‚Œã‚‹ãƒªãƒ“ジョンãŒã‚ã‚‹å ´åˆã€ã¤ã¾ã‚Šãƒžãƒ¼ã‚¸å…ˆã®ãƒªãƒ“ジョンã«BASE
ãŒå«ã¾ã‚Œã¦ã„ãªã„å ´åˆã¯ã€ã„ã‚ゆる"ãƒã‚§ãƒªãƒ¼ãƒ”ック"ãŒè¡Œã‚ã‚Œã¾ã™ã€‚通常ã®ãƒžãƒ¼ã‚¸
ã¨ã¯ã¡ãŒã„ã€ä»Šã®ã¨ã“ã‚Bazaarã§ã¯ãƒã‚§ãƒªãƒ¼ãƒ”ックã¯è¿½è·¡ã—ã¾ã›ã‚“。変更ã¯ã€æ™®é€šã®
コミットã®ã‚ˆã†ã«è¦‹ãˆã€ãƒžãƒ¼ã‚¸å…ƒã§ã®å¤‰æ›´å±¥æ´ã¯ä¿å˜ã•ã‚Œã¾ã›ã‚“。 pushå…ˆã®ãƒ–ランãƒã«é•ã†å¤‰æ›´ãŒã‚ã£ã¦ã€ãれを残ã—ãŸã„ãªã‚‰ã€ã¾ãšpushå…ˆã®ãƒ–ランãƒ
ã‹ã‚‰ãƒžãƒ¼ã‚¸ã—ã¦(bzr help mergeã‚’å‚ç…§)コミットã—ã¦ãã ã•ã„。ãã†ã™ã‚Œã°ã€
'--overwrite'ã®æŒ‡å®šãªã—ã§pushã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚ ã‚‚ã—ã€ãƒªãƒ¢ãƒ¼ãƒˆã®å¤‰æ›´å†…容ã§æ‰‹å…ƒã§ã®å¤‰æ›´å†…容をå˜ç´”ã«ç½®ãæ›ãˆãŸã„å ´åˆã¯ã€
pull --overwriteを使用ã—ã¦ãã ã•ã„。ã“ã‚Œã¯ã€ãƒ–ランãƒåŒå£«ãŒåˆ†å²ã—ã¦ã„ã¦ã‚‚
実行ã§ãã¾ã™ã€‚ デフォルトã§ã¯ãªã特定ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«ã‚¢ãƒƒãƒ—グレードã—ãŸã„å ´åˆã¯ã€--format
オプションã§æŒ‡å®šã—ã¾ã™ã€‚ã“れを利用ã—ã¦ã€upgradeコマンドã§æ˜”ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«
*"ダウングレード"* ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ãŒã€å¤‰æ›å‡¦ç†ã«ã‚ˆã£ã¦ã¯ä¸å¯é€†ãªã‚‚ã®ã‚‚
ã‚ã‚Šã¾ã™ã€‚(ãŸã¨ãˆã°ã€1.xã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‹ã‚‰2.xã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¸ã®å¤‰æ›ã¯ä¸å¯é€†ã§ã™)
ãã®ãŸã‚ã€ãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã§ããªã„å ´åˆã‚‚ã‚ã‚Šã¾ã™ã€‚ 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚„パターンを無視ã—ã¾ã™ã€‚ ビューã«å«ã¾ã‚Œãªã„ファイルã¯ç„¡è¦–ã—ã¾ã™ã€‚ビュー：%s non-recursiveモードã®å ´åˆã€ç„¡è¦–ã•ã‚Œã¦ã„ãŸã‚‚ã®ã‚‚å«ã‚ã¦æŒ‡å®šã•ã‚ŒãŸã™ã¹ã¦ã®
アイテムãŒè¿½åŠ ã•ã‚Œã¾ã™ã€‚指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ãŒæ—¢ã«è¿½åŠ ã•ã‚Œã¦ã„ã‚‹ã‚‚ã®ã ã£ãŸ
å ´åˆã¯ã€è¦å‘ŠãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ recursiveモード(デフォルト)ã®å ´åˆã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«ã®æ‰±ã„ã¯åŒã˜ã§ã™ãŒã€
ディレクトリã®æ‰±ã„ã¯å¤‰ã‚ã‚Šã¾ã™ã€‚æ—¢ã«è¿½åŠ ã•ã‚Œã¦ã„るディレクトリを指定
ã—ã¦ã‚‚è¦å‘Šã«ã¯ãªã‚Šã¾ã›ã‚“。ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚Œã¦ã„ã‚‹ã‹ã©ã†ã‹ã«ã‹ã‹ã‚らãšã€
指定ã•ã‚ŒãŸã™ã¹ã¦ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªå†…ã®ãƒ•ã‚¡ã‚¤ãƒ«ã€ã‚µãƒ–ディレクトリをãƒã‚§ãƒƒã‚¯ã—ã¦ã€
ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†å¯¾è±¡å¤–ã§ã‹ã¤ç„¡è¦–ã•ã‚Œã¦ã„ãªã„ã‚‚ã®ã‚’è¿½åŠ ã—ã¾ã™ã€‚
ã“ã®å‡¦ç†ã¯ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«å¯¾ã—ã¦å†å¸°çš„ã«å®Ÿè¡Œã•ã‚Œã¾ã™ã€‚
何も指定ã•ã‚Œã¦ã„ãªã„å ´åˆã¯ã€'.'ãŒæŒ‡å®šã•ã‚ŒãŸã‚‚ã®ã¨ã¿ãªã—ã¾ã™ã€‚ recursiveモードã®å ´åˆã€add.maximum_file_sizeã®è¨å®šå€¤ã‚ˆã‚Šå¤§ããª
ファイルã¯è¿½åŠ ã•ã‚Œã¾ã›ã‚“。明示的ã«æŒ‡å®šã•ã‚ŒãŸã‚¢ã‚¤ãƒ†ãƒ ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºã«
ã‹ã‹ã‚らãšè¿½åŠ ã•ã‚Œã¾ã™ã€‚ verboseモードã§ã¯ã€ãã‚Œãžã‚Œã®ãƒ¬ãƒãƒ¼ãƒˆã«çµ±è¨ˆæƒ…å ±ãŒè¿½åŠ ã•ã‚Œã¾ã™ã€‚ã•ã‚‰ã«
高度ãªçµ±è¨ˆæƒ…å ±ã‚’è¦‹ã‚‹ã«ã¯ã€-vvã®ã‚ˆã†ã«verboseオプションを複数回指定ã™ã‚‹
ã“ã¨ã«ã‚ˆã£ã¦ã€verboseレベル2以上を指定ã—ã¦ãã ã•ã„。 マージを実行ã™ã‚‹ã‹ã‚ã‚Šã«ã€ãƒžãƒ¼ã‚¸ã•ã‚Œã‚‹å†…容ã®diffを表示ã—ã¾ã™ã€‚ 無効ãªãƒã‚°ã§ã™ã€‚ %s 'トラッカー:id' ã®å½¢å¼ã§æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚詳細㯠"bzr help bugs" ã‚’ã”覧ãã ã•ã„。
コミットã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚ %(path)s ã«å¯¾ã™ã‚‹ä¸æ£ãª range %(range)r: %(msg)s %(path)s ã‹ã‚‰ã®ä¸æ£ãª HTTP レスãƒãƒ³ã‚¹: %(msg)s%(orig_error)s 無効ãªç„¡è¦–パターンãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ %s %(path)s ã® %(offset)s ã«å¯¾ã™ã‚‹ä¸æ£ãª range アクセス: %(msg)s 最åˆã®Nリビジョンã ã‘を出力ã™ã‚‹ 無視ã•ã‚Œã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¨ã€ãã‚ŒãŒã©ã®ãƒ‘ターンã«ã‚ˆã£ã¦ç„¡è¦–ã•ã‚Œã¦ã„ã‚‹ã‹ã‚’一覧ã§è¡¨ç¤ºã—ã¾ã™ã€‚ 指定ã•ã‚ŒãŸç¨®åˆ¥ã®ã‚¢ã‚¤ãƒ†ãƒ (ファイルã€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯)を表示ã—ã¾ã™ã€‚ 作æ¥ãƒ„リー上ã§å‰Šé™¤ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’リストアップã—ã¾ã™ã€‚
ツリー内ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’リストアップã—ã¾ã™ã€‚
無視ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãれらã«ãƒžãƒƒãƒã™ã‚‹ãƒ‘ターンã®ä¸€è¦§ã‚’表示ã™ã‚‹ã€‚ カレントフォルダã«ã‚る利用å¯èƒ½ãªãƒ–ランãƒã‚’リストアップã—ã¾ã™ã€‚ インストールã•ã‚ŒãŸãƒ—ラグインã®ä¸€è¦§ã‚’表示ã™ã‚‹ã€‚ ã“ã®ãƒ„リーã‹ã‚‰ãƒ•ã‚¡ã‚¤ãƒ«IDを検索ã—ã¾ã™ã€‚ ディレクトリをã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚ŒãŸãƒ–ランãƒã«ã—ã¾ã™ã€‚ コミット日時を決ã‚られãŸãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã§æ‰‹å‹•ã§æŒ‡å®šã—ã¾ã™ã€‚例) '2009-10-10 08:00:00 +0100' ã“ã®ãƒªãƒ“ジョンã§ä¿®æ£ã•ã‚ŒãŸãƒã‚°ã‚’マークã™ã‚‹("bzr help bugs"ã‚’å‚ç…§)。 マージ先ã®ãƒ„リーã«ã‚³ãƒŸãƒƒãƒˆã—ã¦ã„ãªã„変更ãŒã‚ã£ã¦ã‚‚マージã—ã¾ã™ã€‚ 空ブランãƒã¸ã®ãƒžãƒ¼ã‚¸ã¯ä»Šã®ã¨ã“ã‚サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。https://bugs.launchpad.net/bzr/+bug/308562 ファイルã¯æ—¢ã«ç§»å‹•æ¸ˆã¿ã®ãŸã‚ã€ãƒ•ã‚¡ã‚¤ãƒ«ã®Bazaar IDã ã‘を移動ã—ã¾ã™ã€‚ ファイルã®ç§»å‹•ã‚„åå‰ã®å¤‰æ›´ã‚’è¡Œã„ã¾ã™ã€‚ ã„ã¾ã®ã¨ã“ã‚ã€ãƒ«ãƒ¼ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®ç§»å‹•ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“ NAME_PATTERNã«çµ¶å¯¾ãƒ‘スã¯æŒ‡å®šã§ãã¾ã›ã‚“。 エクスãƒãƒ¼ãƒˆã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«å†…部ã®rootディレクトリã®åå‰ã€‚ --show-baseオプションを使用ã™ã‚‹ã«ã¯ä½œæ¥ãƒ„リーãŒå¿…è¦ã§ã™ã€‚ リビジョン番å·ã‚„æ—¢å˜ã®ãƒã‚°ã‚’変更ã›ãšã€ãƒªãƒ“ジョンã®è¿½åŠ ã ã‘ã‚’è¡Œã„ã¾ã™ã€‚ æ–°ã—ã„ブランãƒã¯ %s ã«ãƒã‚¤ãƒ³ãƒ‰ã•ã‚Œã¦ã„ã¾ã™ã€‚ リãƒã‚¸ãƒˆãƒªã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®é…下ã«æ–°ã—ã作られãŸãƒ–ランãƒã¯ã€ãƒªãƒ“ジョンを
ブランãƒã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã¯ãªãリãƒã‚¸ãƒˆãƒªã«ä¿å˜ã—ã¾ã™ã€‚リビジョンを共有
ã—ã¦ã„るブランãƒåŒå£«ã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã‚µã‚¤ã‚ºãŒç¯€ç´„ã•ã‚Œã€æ–°ã—ã„ブランãƒã‚’作æˆ
ã™ã‚‹ã‚¹ãƒ”ードも速ããªã‚Šã¾ã™ã€‚ "%(filename)s" ã«ãƒãƒ³ãƒ‰ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 コミットã™ã‚‹å¤‰æ›´ãŒã‚ã‚Šã¾ã›ã‚“。コミットã—ãŸã„ファイルを'bzr add'ã§è¿½åŠ ã™ã‚‹ã‹ã€--unchangedを指定ã—ã¦ç©ºã®ã‚³ãƒŸãƒƒãƒˆã‚’実行ã—ã¦ãã ã•ã„。 対象ã®å ´æ‰€ãŒè¨å®šã‚‚指定もã•ã‚Œã¦ã„ã¾ã›ã‚“。 対象ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ プッシュã™ã‚‹æ–°ã—ã„リビジョンやタグã¯ã‚ã‚Šã¾ã›ã‚“。 プッシュã™ã‚‹æ–°ã—ã„リビジョンã¯ã‚ã‚Šã¾ã›ã‚“。 pull対象ブランãƒãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。 pushå…ˆã®ãƒ–ランãƒãŒè¨å®šã‚‚指定もã•ã‚Œã¦ã„ã¾ã›ã‚“。 pushå…ˆãŒè¨å®šã‚‚指定もã•ã‚Œã¦ã„ã¾ã›ã‚“。親ブランãƒ(%s)ã«pushã™ã‚‹å ´åˆã¯ã€'bzr push :parent'を使用ã—ã¦ãã ã•ã„。 ãƒã‚° %s ã®ãƒã‚°ãƒˆãƒ©ãƒƒã‚«ãƒ¼ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。'トラッカー:id'ã®å½¢å¼ã«ã™ã‚‹ã‹ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒˆãƒ©ãƒƒã‚«ãƒ¼ã‚’ `bugtracker` オプションã§æŒ‡å®šã—ã¦ãã ã•ã„。
詳細㯠"bzr help bugs" ã‚’ã”覧ãã ã•ã„。コミットã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚ 削除ã™ã‚‹ä½œæ¥ãƒ„リーãŒã‚ã‚Šã¾ã›ã‚“。 --shortã¾ãŸã¯-Sを指定ã—ãŸå ´åˆã€Subversionã®statusコマンドã¨åŒã˜ã‚ˆã†ã«
ã™ã¹ã¦ã®ã‚¢ã‚¤ãƒ†ãƒ ã«ãƒžãƒ¼ã‚«ãƒ¼ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。
SVNã§-qを指定ã—ãŸå ´åˆã¨åŒã˜ã‚ˆã†ãªå½¢å¼ã«ã™ã‚‹ã«ã¯ã€bzr status -SV ã‚’
使用ã—ã¦ãã ã•ã„。 -rオプションã§ãƒªãƒ“ジョンã®ç¯„囲を指定ã—ãŸå ´åˆã¯ã€ãã®ï¼’ã¤ã®ãƒªãƒ“ジョン間ã§ã®
差分ãŒå–å¾—ã•ã‚Œã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。ã¤ã¾ã‚Šã€ãƒªãƒ“ジョンã®ç¯„囲ã®é–‹å§‹
リビジョンã§ã®å¤‰æ›´ã¯å«ã¾ã‚Œã¾ã›ã‚“。ã“ã‚Œã¯ã€"bzr log"ã«ãƒªãƒ“ジョンã®ç¯„囲を
指定ã—ãŸå ´åˆã®å‹•ä½œ(開始リビジョンもå«ã‚€)ã¨ã¯ç•°ãªã‚Šã¾ã™ã€‚ 注: ASCIIã§ã¯ãªã„ファイルをå«ã‚€ãƒ„リーã®ã€zipã¸ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã›ã‚“。 ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã§ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’使用ã™ã‚‹éš›ã«ã¯æ¨™æº–出力をリダイレクトã™ã‚‹ã‚ˆã†ã«
æ°—ã‚’ã¤ã‘ã¦ãã ã•ã„。 ブランãƒã ã‘ã§ãªãã€bzr sendã§ç”Ÿæˆã•ã‚ŒãŸãƒžãƒ¼ã‚¸ãƒ‡ã‚£ãƒ¬ã‚¯ãƒ†ã‚£ãƒ–ã‚’å«ã‚€ãƒ•ã‚¡ã‚¤ãƒ«
ã‚‚pull対象ã¨ã—ã¦æŒ‡å®šã§ãã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。 ãªã«ã‚‚ã™ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã›ã‚“。 表示ã™ã‚‹ãƒ¬ãƒ™ãƒ«ã€‚-0ã§å…¨ã¦ã€1ã§ï¼‘階層 OTHER_BRANCHã¯localã‚‚ã—ãã¯remoteã«ãªã‚Šã¾ã™ã€‚ エラーやè¦å‘Šã ã‘を表示ã—ã¾ã™ã€‚ --autoを指定ã™ã‚‹å ´åˆã¯ãƒ‘スã¯ã²ã¨ã¤ã ã‘指定ã—ã¦ãã ã•ã„。 ã¾ã コミットã•ã‚Œã¦ã„ãªã„ファイルã ã‘を削除ã—ã¾ã™ã€‚ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚Œã¦ã„るファイルã ã‘を表示ã—ã¾ã™ã€‚ ä»–ã®ãƒ–ランãƒã«ã¯æ–°ã—ã„リビジョンã¯ã‚ã‚Šã¾ã›ã‚“。
1.x シリーズã§ä½¿ã‚ã‚Œã¦ã„るパックベースã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã€‚0.92 ã§å°Žå…¥ã•ã‚Œã¾ã—ãŸã€‚0.92 以å‰ã® bzr リãƒã‚¸ãƒˆãƒªã¨ç›¸äº’é‹ç”¨å¯èƒ½ã§ã™ãŒã€0.92 よりå‰ã® bzr ã‹ã‚‰ã¯èªã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“。 %s ã®è¦ªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒã‚ã‚Šã¾ã›ã‚“。
--create-prefixを指定ã™ã‚Œã°ã€è¦ªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚‚作æˆã•ã‚Œã¾ã™ã€‚ "%s" ã®è¦ªãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。 ã“れらã®ã‚ªãƒ—ションã¯å¤–部ã®diffプãƒã‚°ãƒ©ãƒ ã«æ¸¡ã•ã‚Œã¾ã™ã€‚ 最後ã®ãƒªãƒ“ジョンã«ã‚‚最åˆã®ãƒªãƒ“ジョンã«ã‚‚パスãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: %s !!ã§å§‹ã¾ã‚‹ãƒ‘ターンã¯ã€é€šå¸¸ã®ç„¡è¦–指定ã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ãŒã€!ã«ã‚ˆã‚‹é™¤å¤–
パターンよりも優先ã•ã‚Œã¾ã™ã€‚ !ã§å§‹ã¾ã‚‹ãƒ‘ターンã¯ã€ç„¡è¦–指定ã‹ã‚‰ã®é™¤å¤–を表ã—ã€é€šå¸¸ã®ç„¡è¦–指定よりも
優先ã•ã‚Œã¾ã™ã€‚ã“ã‚Œã¯ã€æ™®é€šãªã‚‰ç„¡è¦–ã•ã‚Œã‚‹ã¯ãšã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†
ã®å¯¾è±¡ã¨ã™ã‚‹ãŸã‚ã«ä½¿ã„ã¾ã™ã€‚ 軽é‡ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã‚’作æˆã—ã¾ã™ã€‚軽é‡ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆä¸Šã§ã®æ“作ã«ã¯ã€ãƒã‚§ãƒƒã‚¯
アウト元ã®ãƒ–ランãƒã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚通常ã®ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã®
å ´åˆã¯ã€diffã‚„statusã®ã‚ˆã†ãªä¸€èˆ¬çš„ãªæ“作ã§ã¯ãã®å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“ã—ã€ãƒãƒ¼ã‚«ãƒ«
コミットã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ ãƒã‚¤ãƒ³ãƒ‰ã•ã‚ŒãŸãƒ–ランãƒã«ãƒãƒ¼ã‚«ãƒ«ã‚³ãƒŸãƒƒãƒˆã‚’実行ã™ã‚‹ã€‚ 通常ã®ã‚³ãƒŸãƒƒãƒˆãŒå®Ÿè¡Œã•ã‚Œã‚‹ã¾ã§ ãƒãƒ¼ã‚«ãƒ«ã‚³ãƒŸãƒƒãƒˆã¯ãƒžã‚¹ã‚¿ãƒ¼ãƒ–ランãƒã«pushã•ã‚Œã¾ã›ã‚“。 ãƒã‚¤ãƒ³ãƒ‰ãƒ–ランãƒã«å¯¾ã—ã¦pullã™ã‚‹å ´åˆã«ã€ãƒžã‚¹ã‚¿ãƒ¼ãƒ–ランãƒã«ã¯åæ˜ ã—ãªã„よã†ã«ã—ã¾ã™ã€‚ 3wayマージを実行ã—ã¾ã™ã€‚ 無視ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示ã—ã¾ã™ã€‚ リビジョン番å·ã‚’表示ã—ã¾ã™ã€‚ ブランãƒã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ を表示ã¾ãŸã¯è¨å®šã—ã¾ã™ã€‚ ブランãƒã®ãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®ç›¸å¯¾ãƒ‘スを表示ã—ã¾ã™ã€‚ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示ã—ã¾ã™ã€‚ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示ã—ã¾ã™ã€‚ リビジョン%dã¾ã§ãƒ—ッシュã—ã¾ã—ãŸã€‚ ファイルã®ãƒ„リーをインãƒãƒ¼ãƒˆã™ã‚‹ãŸã‚ã®ãƒ¬ã‚·ãƒ”:: ブランãƒå†…ã®Bazaarã®ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿ã‚’修復ã—ã¾ã™ã€‚ サブディレクトリもå†å¸°ã§å‡¦ç†ã—ã¾ã™ã€‚ 指定ã•ã‚ŒãŸå ´æ‰€ã ã‘ã§ãªãã€å†å¸°çš„ã«ãƒ–ランãƒã‚’探ã—ã¾ã™ã€‚ マージをやりãªãŠã—ã¾ã™ã€‚ 作æ¥ãƒ„リーã®ä¸ã«ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå˜åœ¨ã™ã‚‹å ´åˆã‚³ãƒŸãƒƒãƒˆã‚’æ‹’å¦ã™ã‚‹ã€‚ 作æ¥ã‚³ãƒ”ーãŒå¤‰æ›´ã•ã‚Œã¦ã„ã‚‹å ´åˆã¯pushã§ãã¾ã›ã‚“ãŒã€--no-strictオプションを指定
ã™ã‚‹ã¨pushã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚ ファイルやディレクトリを削除ã—ã¾ã™ã€‚ ファイルを一切変更ã›ãšã«ã€æœªè§£æ±ºã®ãƒžãƒ¼ã‚¸ãƒžãƒ¼ã‚«ã‚’削除ã™ã‚‹ã€‚ エイリアスを削除ã—ã¾ã™ã€‚ 変æ›ã«æˆåŠŸã—ãŸã‚‰backup.bzrディレクトリを削除ã—ã¾ã™ã€‚ 作æ¥ãƒ„リーãŒå¤‰æ›´ã•ã‚Œã¦ã„ãŸã‚Šã€ã‚·ã‚§ãƒ«ãƒ•ã•ã‚ŒãŸå¤‰æ›´ãŒã‚ã£ã¦ã‚‚ã€ä½œæ¥ãƒ„リーを削除ã—ã¾ã™ã€‚ 指定ã•ã‚ŒãŸãƒ–ランãƒ/ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã‹ã‚‰ä½œæ¥ãƒ„リーを削除ã—ã¾ã™ã€‚ リãƒã‚¸ãƒˆãƒª %r ã¯ãƒªãƒ“ジョンã®textã¸ã®ç›´æŽ¥ã‚¢ã‚¯ã‚»ã‚¹ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“ リãƒã‚¸ãƒˆãƒªãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ リビジョンã®è¡¨ç¤ºé †ã‚’逆転ã™ã‚‹ã€‚ リビジョン番å·ã¯å¸¸ã«å…ƒã®ãƒ–ランãƒã«é–¢é€£ã—ã¾ã™ã€‚ "%(file_id)s" ã«ã¯ã™ã§ã«ãƒªãƒ“ジョン {%(revision_id)s} ãŒå˜åœ¨ã—ã¦ã„ã¾ã™ã€‚ "%(file_id)s" ã«ã¯ãƒªãƒ“ジョン {%(revision_id)s} ãŒã‚ã‚Šã¾ã›ã‚“。 --mine-onlyã¨åŒã˜ã€‚ --theirs-onlyã¨åŒã˜ã€‚ 詳細㯠"help revisionspec" ã‚’å‚ç…§ã—ã¦ãã ã•ã„。 パターンã®æ›¸ãæ–¹ã®è©³ç´°ã¯ ``bzr help patterns`` ã‚’ã”覧ãã ã•ã„。 変更をインタラクティブã«é¸æŠžã—ã¾ã™ã€‚ 全体è¨å®šã§ã¯ãªãã€ç¾åœ¨ã®ãƒ–ランãƒã ã‘ã«IDã‚’è¨å®šã—ã¾ã™ã€‚ å„ファイルã®ç·¨é›†æ—¥æ™‚ã‚’ã€æœ€å¾Œã«ãã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¤‰æ›´ã•ã‚ŒãŸãƒªãƒ“ジョンã®æ—¥æ™‚ã«è¨å®šã—ã¾ã™ã€‚ å¤ã„ファイルåã¨æ–°ã—ã„ファイルåã«ãƒ—ãƒ¬ãƒ•ã‚£ãƒƒã‚¯ã‚¹ã‚’è¿½åŠ ã—ã¾ã™ã€‚ï¼’ã¤ã®å€¤ã‚’コãƒãƒ³ã§åŒºåˆ‡ã£ã¦æŒ‡å®šã—ã¾ã™ã€‚(例 "old/:new/") 著者ã®åå‰ãŒã‚³ãƒŸãƒƒã‚¿ãƒ¼ã¨ã¯ç•°ãªã‚‹å ´åˆã€è‘—者ã®åå‰ã‚’è¨å®šã™ã‚‹ã€‚ エイリアスã®è¨å®šã€è§£é™¤ã€è¡¨ç¤ºã‚’è¡Œã„ã¾ã™ã€‚ è¡çªã—ãŸãƒ™ãƒ¼ã‚¹ãƒªãƒ“ジョンã®ãƒ†ã‚ストを表示ã—ã¾ã™ã€‚ å„リビジョンã§ã®å¤‰æ›´ã‚’パッãƒã¨ã—ã¦è¡¨ç¤º ç¾åœ¨ã®ãƒªãƒ“ジョン番å·ã‚’表示ã—ã¾ã™ã€‚ 作æ¥ãƒ„リーやã€ãƒªãƒ“ジョンã€ãƒ–ランãƒé–“ã®å·®åˆ†ã‚’表示ã—ã¾ã™ã€‚ デジタル署åを表示 å„リビジョンã§ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´ã‚’表示ã™ã‚‹ å¤ã„æ–¹ã‹ã‚‰æ–°ã—ã„æ–¹ã¸è¡¨ç¤ºã™ã‚‹ コマンドもã—ãã¯ä»–ã®ãƒˆãƒ”ックã®ãƒ˜ãƒ«ãƒ—を表示ã™ã‚‹ã€‚
å…¨ã¦ã®ã‚³ãƒžãƒ³ãƒ‰ã®ãƒ˜ãƒ«ãƒ—を表示ã™ã‚‹ã€‚ ブランãƒã€ã‚‚ã—ãã¯ãƒ–ランãƒã®ä¸€éƒ¨ã®å±¥æ´ãƒã‚°ã‚’表示ã—ã¾ã™ã€‚ 作æ¥ã‚³ãƒ”ーã€ãƒ–ランãƒã€ãƒªãƒã‚¸ãƒˆãƒªã®æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚ 指定ã•ã‚ŒãŸãƒªãƒ“ジョンã ã‘を表示ã™ã‚‹ã€‚ ``help revisionspec``ã‚’å‚ç…§ 変åã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’リストアップã—ã¾ã™ã€‚
pull対象リビジョンã®ãƒã‚°ã‚’表示ã—ã¾ã™ã€‚ --levels 0 ã¨åŒã˜ã‚ˆã†ã«ãƒžãƒ¼ã‚¸ã•ã‚ŒãŸãƒªãƒ“ジョンを表示ã™ã‚‹ bzrã®ãƒ¦ãƒ¼ã‚¶IDを表示ã€è¨å®šã—ã¾ã™ã€‚ 作者ãŒæŒ‡å®šã•ã‚ŒãŸè¡¨ç¾ã«ãƒžãƒƒãƒã™ã‚‹ãƒªãƒ“ジョンを表示ã™ã‚‹ ãƒã‚°æƒ…å ±ãŒæŒ‡å®šã•ã‚ŒãŸè¡¨ç¾ã«ãƒžãƒƒãƒã™ã‚‹ãƒªãƒ“ジョンを表示ã—ã¾ã™ コミッタãŒæŒ‡å®šã•ã‚ŒãŸè¡¨ç¾ã«ãƒžãƒƒãƒã™ã‚‹ãƒªãƒ“ジョンを表示ã™ã‚‹ ã“ã®è¡¨ç¾ã«ãƒžãƒƒãƒã™ã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ãƒªãƒ“ジョンを表示 ã“ã®è¡¨ç¾ã«ãƒžãƒƒãƒã™ã‚‹ãƒ—ãƒãƒ‘ティã®ãƒªãƒ“ジョンを表示 作æ¥ãƒ„リーã®ãƒªãƒ“ジョン番å·ã‚’表示ã—ã¾ã™ã€‚ ツリーã®ãƒ«ãƒ¼ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’表示ã—ã¾ã™ã€‚ 2ã¤ã®ãƒ–ランãƒã®é–“ã®mergeã•ã‚Œã¦ã„ãªã„/pullã•ã‚Œã¦ã„ãªã„ リビジョンを表示ã™ã‚‹ã€‚ 使ã„æ–¹ã¨ã‚ªãƒ—ションを表示ã—ã¾ã™ã€‚ Bazaarã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã—ã¾ã™ã€‚ 何ãŒå®Ÿè¡Œã•ã‚Œã‚‹ã‹ã‚’表示ã—ã¾ã™ãŒã€å®Ÿéš›ã«ã¯ä½•ã‚‚ã—ã¾ã›ã‚“。 Show-baseã¯ã“ã®ãƒžãƒ¼ã‚¸ã‚¿ã‚¤ãƒ—ã§ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã›ã‚“。 %s 軽é‡ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã¯ä½œæ¥ãƒ„リーよりもå°ã•ã„ãŸã‚ã€è»½é‡ãƒã‚§ãƒƒã‚¯
アウトã«å¯¾ã—ã¦å®Ÿè¡Œã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 å°†æ¥çš„ã«ã€ä½œæ¥ãƒ„リーã®æ›´æ–°ãŒã§ãるよã†ãªã‚¹ãƒžãƒ¼ãƒˆã‚µãƒ¼ãƒã‚„プãƒãƒˆã‚³ãƒ«ãŒãƒªãƒªãƒ¼ã‚¹
*ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“*。 remergeã¯é€šå¸¸ã®ãƒžãƒ¼ã‚¸å¾Œã«ã ã‘実行ã§ãã¾ã™ã€‚ãƒã‚§ãƒªãƒ¼ãƒ”ックや複数マージã§ã¯
利用ã§ãã¾ã›ã‚“。 ブランãƒã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’指定ã—ã¾ã™ã€‚"help formats"ã‚’ã”覧ãã ã•ã„。 リãƒã‚¸ãƒˆãƒªã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’指定ã—ã¾ã™ã€‚詳ã—ãã¯"bzr help formats"ã‚’ã”覧ãã ã•ã„。 カレントディレクトリã«ã‚ã‚‹ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã®å‚照先を新ã—ã„ブランãƒã«åˆ‡ã‚Šæ›¿ãˆã¾ã™ã€‚ ãƒã‚¤ãƒ³ãƒ‰å…ˆã‚’スイッãƒã—ã¾ã—ãŸã€‚: %s ã‚¿ã‚°ã¯1ã¤ã®ãƒªãƒ“ジョンã«ã—ã‹æŒ‡å®šã§ãã¾ã›ã‚“ ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å–å¾—ã™ã‚‹ã€‚ 対象ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª "%s" ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚ テã‚ストãŒãƒã‚§ãƒƒã‚¯ã‚µãƒ ã¨ä¸€è‡´ã—ã¾ã›ã‚“: %(msg)s dir 引数を指定ã™ã‚‹å ´åˆã¯ã€ä½œæ¥ãƒ„リーã®ãƒ«ãƒ¼ãƒˆã‚’指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
デフォルトã§ã¯ã€ã‚«ãƒ¬ãƒ³ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’å«ã‚€ä½œæ¥ãƒ„リーãŒé¸æŠžã•ã‚Œã¾ã™ã€‚ --verbose オプション㯠pull ã•ã‚ŒãŸãƒªãƒ“ジョンを log_format è¨å®šã‚ªãƒ—ションを
利用ã—ã¦è¡¨ç¤ºã—ã¾ã™ã€‚ -Olog_format=<other_format> ã¨æŒ‡å®šã™ã‚‹ã“ã¨ã§ã€
別ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã§è¡¨ç¤ºã§ãã¾ã™ã€‚ --verbose オプション㯠push ã•ã‚ŒãŸãƒªãƒ“ジョンを log_format è¨å®šã‚ªãƒ—ションを
利用ã—ã¦è¡¨ç¤ºã—ã¾ã™ã€‚ -Olog_format=<other_format> ã¨æŒ‡å®šã™ã‚‹ã“ã¨ã§ã€
別ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã§è¡¨ç¤ºã§ãã¾ã™ã€‚ colocated branch を実験的ã«ã‚µãƒãƒ¼ãƒˆã™ã‚‹ 2a フォーマット。
ブランãƒã¯ã€ãƒãƒ¼ã‚«ãƒ«ãƒ‡ã‚£ã‚¹ã‚¯ã‚„sftpã®ã‚ˆã†ãªã€ãƒªã‚¹ãƒˆå¯èƒ½ãªã‚·ã‚¹ãƒ†ãƒ 上ã«
ã‚ã‚‹*å¿…è¦ãŒã‚ã‚Šã¾ã™*。 ブランム{0} ã«ãƒªãƒ“ジョン {1} ã¯ã‚ã‚Šã¾ã›ã‚“。 使用ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«å‰Šé™¤ãƒ¢ãƒ¼ãƒ‰ã§ã™ã€‚ フィルタリングã€ä¸¦ã³æ›¿ãˆã€å„リビジョンã«è¡¨ç¤ºã™ã‚‹æƒ…å ±ã«ã¤ã„ã¦ã¯ã€ä»¥ä¸‹ã®ã‚ˆã†ã«
変更ã§ãã¾ã™ã€‚デフォルトã§ã¯ã€å…¨ã¦ã®ãƒªãƒ“ジョンãŒ(トãƒãƒã‚¸ã‚«ãƒ«ã«)ソートã•ã‚Œã€
æ–°ã—ã„リビジョンã¯å¤ã„リビジョンよりå‰ã«ã€åå«ã®ãƒªãƒ“ジョンã¯å…ˆç¥–よりå‰ã«é…ç½®
ã•ã‚Œã¾ã™ã€‚マージã•ã‚ŒãŸãƒªãƒ“ジョンを表示ã™ã‚‹å ´åˆã¯ã€ãƒžãƒ¼ã‚¸å…ˆã®ãƒªãƒ“ジョンよりも
インデントã•ã‚Œã¦è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ levelsã¯æ•´æ•°ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。 limitã¯æ•´æ•°ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。 remergeã®ã‚ªãƒ—ションã®æ„味ã¨ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯mergeã¨åŒã˜ã§ã™ã€‚é•ã„ã¯ã€
remergeã¯ãƒžãƒ¼ã‚¸ä¸çŠ¶æ…‹ã®ã¨ãã ã‘実行ã§ãã€ç‰¹å®šã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定ã§ãã‚‹
ã¨ã„ã†ã“ã¨ã§ã™ã€‚ å¤ã„ツリーã®ãƒ‘スå。 リãƒã‚¸ãƒˆãƒª {0} ã«ã¯ãƒªãƒ“ジョン {1} ã¯ã‚ã‚Šã¾ã›ã‚“。 マージã®çµæžœã¯ãƒžãƒ¼ã‚¸å…ˆã®ä½œæ¥ãƒ„リー内ã«åæ˜ ã•ã‚Œã€ãã“ã§(bzr diffを使ã£ã¦)
レビューã—ãŸã‚Šã€ãƒ†ã‚¹ãƒˆã‚’ã—ãŸã‚ã¨ã§ã€ã‚³ãƒŸãƒƒãƒˆã«ã‚ˆã£ã¦è¨˜éŒ²ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ ルートã¨ã¯ã€.bzr管ç†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’æŒã¤ã€ä¸€ç•ªè¿‘ã„上ä½ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®ã“ã¨ã§ã™ã€‚ マージ元ã«ã¯ã€ãƒ–ランãƒã‹ã€bzr sendã§ä½œã‚‰ã‚ŒãŸãƒžãƒ¼ã‚¸ãƒ‡ã‚£ãƒ¬ã‚¯ãƒ†ã‚£ãƒ–ファイル
ã®ãƒ‘スを指定ã§ãã¾ã™ã€‚ã©ã¡ã‚‰ã‚‚指定ã•ã‚Œã¦ã„ãªã„å ´åˆã¯ã€ã‚¢ãƒƒãƒ—ストリームブランãƒ
ã‹ã€ä¸€ç•ªæœ€å¾Œã«--remember指定ã§ãƒžãƒ¼ã‚¸ã—ãŸæ™‚ã®ãƒžãƒ¼ã‚¸å…ƒãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã«ãªã‚Šã¾ã™ã€‚
別ã®ãƒ–ランãƒå†…ã®ãƒ•ã‚¡ã‚¤ãƒ«ãƒ‘スをマージ元ã¨ã—ã¦æŒ‡å®šã™ã‚‹ã“ã¨ã‚‚ã§ãã€ãã®å ´åˆã¯
指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´ã ã‘ãŒç¾åœ¨ã®ãƒ–ランãƒã«ãƒžãƒ¼ã‚¸ã•ã‚Œã¾ã™ã€‚ ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã®åˆ¥åã§ã‚ã‚‹'clone'ã¨'get'ã¯å»ƒæ¢äºˆå®šã§ã™ã€‚ 対象ã®ãƒ–ランãƒã®ä½œæ¥ãƒ„リーã®æ›´æ–°ã¯ã‚³ã‚¹ãƒˆãŒé«˜ãã€ãƒªãƒ¢ãƒ¼ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ã§ã¯
サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ãŸã‚ã€ä½œæ¥ãƒ„リーã®æ›´æ–°ã¯è¡Œã„ã¾ã›ã‚“。 ツリーã¯å£Šã‚Œã¦ã„ãªã„よã†ã§ã™ã€‚代ã‚ã‚Šã«"bzr revert"を実行ã—ã¦ãã ã•ã„。もã—ã€æœ¬å½“ã«ä½œæ¥ãƒ„リーをリセットã—ãŸã„ã®ã§ã‚ã‚Œã°ã€"--force"オプションを指定ã—ã¦ãã ã•ã„。 作æ¥ãƒ„リーã¨ãƒ–ランãƒã®ãƒã‚§ãƒƒã‚¯çµæžœã¯ã€å•é¡ŒãŒè¦‹ã¤ã‹ã£ãŸã¨ãã ã‘表示
ã•ã‚Œã¾ã™ã€‚リãƒã‚¸ãƒˆãƒªãƒã‚§ãƒƒã‚¯ã®å‡ºåŠ›ã¯æ¬¡ã®é€šã‚Šã§ã™ã€‚: 作æ¥ãƒ„リー %(basedir)s ãŒæœ€å¾Œã®ã‚³ãƒŸãƒƒãƒˆã‹ã‚‰å¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ã€‚ 作æ¥ãƒ„リーãŒå¤‰æ›´ã•ã‚Œã¦ã„ã‚‹å ´åˆweaveマージã¯ã§ãã¾ã›ã‚“。 ã¤ã¾ã‚Šã€å˜ã« 'bzr add' ã¨ã—ãŸå ´åˆã¯ã€ã™ã¹ã¦ã®ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ãŒãƒãƒ¼ã‚¸ãƒ§ãƒ³
管ç†ã«è¿½åŠ ã•ã‚Œã¾ã™ã€‚ ã“ã®ãƒ–ランãƒãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«append-revisions-onlyã¯æŒ‡å®šã§ãã¾ã›ã‚“。--defaultを試ã—ã¦ãã ã•ã„。 ブランãƒã«ã‚³ãƒŸãƒƒãƒˆãŒã‚ã‚Šã¾ã›ã‚“。('bzr pull'を使ã†ã¹ãã‹ã‚‚ã—ã‚Œã¾ã›ã‚“) ã“ã®ãƒ–ランãƒã«ã¯æ–°ã—ã„リビジョンã¯ã‚ã‚Šã¾ã›ã‚“。
ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã€ã‚ªãƒšãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã®å¤±æ•—ã‚„Bzrã®ã‚¢ãƒƒãƒ—グレードã«ã‚ˆã£ã¦ã§ããŸ
ã¨æ€ã‚れるデータã®ä¸æ•´åˆã‚’ä¿®æ£ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚'bzr check'ã®çµæžœã‚„ã€
Bzrã®é–‹ç™ºè€…ã‹ã‚‰ã®æŒ‡ç¤ºãŒã‚ã‚‹ã¨ã以外ã¯ã€å®Ÿè¡Œã™ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。 ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã€ãƒ‡ãƒ¼ã‚¿ã®ç ´æã‚„bzrã®ãƒã‚°ã‚’検出ã™ã‚‹ãŸã‚ã«ã€ãƒ–ランãƒã¨ãƒªãƒã‚¸ãƒˆãƒª
ストレージã®ä¸å¤‰æ¡ä»¶ã‚’ãƒã‚§ãƒƒã‚¯ã—ã¾ã™ã€‚ ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ インストールã•ã‚ŒãŸãƒ—ラグインã®ä¸€è¦§ã‚’ç°¡å˜ãªèª¬æ˜Žã‚„
ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã¨ã¨ã‚‚ã«è¡¨ç¤ºã—ã¾ã™ã€‚ ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã€åˆ†å²ã—ã¦ã„ãªã„ブランãƒåŒå£«ã§ã®ã¿ä½¿ç”¨ã§ãã¾ã™ã€‚push先ブランãƒ
ã®æœ€æ–°ã®ã‚³ãƒŸãƒƒãƒˆãŒ(直接的ã€ã‚‚ã—ãã¯é–“接的ã«)pushå…ƒã®ãƒ–ランãƒã«ã¾ã マージã•ã‚Œã¦
ã„ãªã„状態ã®å ´åˆã«ã€ãƒ–ランãƒãŒåˆ†å²ã—ã¦ã„ã‚‹ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚ ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã€ç¾åœ¨ã®å ´æ‰€ã«ã‚ã‚‹å…¨ã¦ã®ãƒ–ランãƒã®åå‰ã‚’表示ã—ã¾ã™ã€‚ ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã€ãƒ„リーã€ãƒ–ランãƒã€ãƒªãƒã‚¸ãƒˆãƒªã«é–¢é€£ã™ã‚‹æ‰€åœ¨ã‚„フォーマット
ã®ã™ã¹ã¦ã®æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚ ã“ã‚Œã¯ã€ãƒ–ランãƒå†…ã®ãƒªãƒ“ジョンã®æ•°ã¨åŒã˜ã§ã™ã€‚ ディレクトリを作æˆã—ã¦ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã«è¿½åŠ ã™ã‚‹ã“ã¨ã¨åŒã˜ã§ã™ã€‚ ã“れを行ã†ã¨ Bazaar ã¯æŒ‡å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´ã®ãƒˆãƒ©ãƒƒã‚¯ã‚’åœæ¢ã—ã¾ã™ã€‚
ã“れらã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒ revert を用ã„ã¦ç°¡å˜ã«å¾©å…ƒã§ãã‚‹å ´åˆã«ã¯å‰Šé™¤ã‚’
è¡Œã„ã¾ã™ãŒã€ãã†ã§ãªã„å ´åˆã«ã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãŒä½œã‚‰ã‚Œã¾ã™ (.~#~ ã¨ã„ã†
å½¢ã®æ‹¡å¼µåã‚’ä»˜åŠ ã—ã¾ã™)。オプションやパラメータãŒæŒ‡å®šã•ã‚Œãªã‹ã£ãŸ
å ´åˆã«ã¯ã€Bazaar ãŒãƒˆãƒ©ãƒƒã‚¯ã—ã¦ã„るファイルã®ã†ã¡ã€ç¾åœ¨ã®ãƒ¯ãƒ¼ã‚ング
ツリーã«å˜åœ¨ã—ãªã„ファイルを検索ã—ã€ã“れらã®ãƒˆãƒ©ãƒƒã‚¯ã‚’ä¸æ¢ã—ã¾ã™ã€‚ ã“ã®æ“作ã§ã¯ bazaar リãƒã‚¸ãƒˆãƒªå†…ã®ãƒ‡ãƒ¼ã‚¿ã‚’圧縮ã—ã¾ã™ã€‚
Bazaar ã¯ãƒªãƒã‚¸ãƒˆãƒªã®è‡ªå‹•ãƒ‘ック機能を備ãˆã¦ã„ã‚‹ãŸã‚ã€
通常ã¯ã“ã®æ“作を手動ã§è¡Œã†å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。 ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†å¤–ファイル
ã«ã¤ã„ã¦ã€ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã”ã¨ã«ã‚°ãƒ«ãƒ¼ãƒ”ングã—ã¦è¡¨ç¤ºã—ã¾ã™ã€‚
表示ã•ã‚Œã‚‹ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã™ã€‚: 移動先ã®ãƒªãƒ“ジョン(ブランãƒã®Tipã‚‚ã—ãã¯æŒ‡å®šã•ã‚ŒãŸãƒªãƒ“ジョン)を作æ¥ãƒ„リーã«
マージã—ã¦ã€ãã®ãƒªãƒ“ジョンを作æ¥ãƒ„リーã®ãƒ™ãƒ¼ã‚¹ãƒªãƒ“ジョンã«è¨å®šã—ã¾ã™ã€‚ 作æ¥ãƒ•ã‚©ãƒ«ãƒ€ã¨æŒ‡å®šãƒªãƒ“ジョンã¨ã‚’比較ã™ã‚‹ã«ã¯ã€ãƒªãƒ“ジョンを一ã¤ã ã‘
引数ã«æŒ‡å®šã—ã¦ãã ã•ã„。 別ã®æœ€çµ‚リビジョンを指定ã™ã‚‹ã«ã¯ã€"-revision OTHER"を指定ã—ã¾ã™ã€‚ã“ã®å ´åˆã€
OTHERã¾ã§(OTHERã‚‚å«ã‚€)ã®å…¨ã¦ã®å¤‰æ›´ãŒãƒžãƒ¼ã‚¸ã•ã‚Œã¾ã™ã€‚ 作æ¥ãƒ„リーをå†ä½œæˆã™ã‚‹ã«ã¯ã€ "bzr checkout" ã‚’ã—ã¦ãã ã•ã„。 無視リストã‹ã‚‰ãƒ‘ターンを削除ã™ã‚‹ã«ã¯ã€.bzrignoreファイルを編集ã—ã¾ã™ã€‚
ignoreコマンドやエディタã§ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¨ãƒ³ãƒˆãƒªã‚’è¿½åŠ ã€ç·¨é›†ã€å‰Šé™¤ã—ãŸ
å ´åˆã¯ã€å¿˜ã‚Œãšã«ã‚³ãƒŸãƒƒãƒˆã—ã¦ãã ã•ã„。 ブランãƒã®ç‰¹å®šã®ãƒªãƒ“ジョンã§å–り出ã—ãŸã„å ´åˆã¯ã€"branch foo/bar -r 5"ã®
よã†ã«--revisionオプションを指定ã—ã¦ãã ã•ã„。 ブランãƒã®ç‰¹å®šã®ãƒªãƒ“ジョンã§å–り出ã—ãŸã„å ´åˆã¯ã€"checkout foo/bar -r 5"ã®
よã†ã«--revisionオプションを指定ã—ã¦ãã ã•ã„。ãã®å ´åˆã¯ä½œæ¥ã‚³ãƒ”ーãŒå¤ã„状態ã«
ãªã‚‹ãŸã‚ã€ã‚³ãƒŸãƒƒãƒˆã¯ã§ãã¾ã›ã‚“ãŒã€ä¾‹ãˆã°å¤ã„コードをãƒã‚§ãƒƒã‚¯ã™ã‚‹å ´åˆãªã©ã«
役立ã¡ã¾ã™ã€‚ 無視ファイルを見るã«ã¯'bzr ignored'を使ã£ã¦ãã ã•ã„。
ファイルã®å†…容ã®å¤‰æ›´ã‚’詳ã—ã見るã«ã¯ã€'bzr diff'を使ã£ã¦ãã ã•ã„。 指定ã•ã‚ŒãŸãƒªãƒ“ジョンã§ã€ã‚‚ã—ãã¯æŒ‡å®šã•ã‚ŒãŸï¼’ã¤ã®ãƒªãƒ“ジョン間ã§ã©ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒ
変更ã•ã‚ŒãŸã‹ã‚’見るã«ã¯ã€ï¼’ã¤ã®ãƒªãƒ“ジョンを引数ã«æŒ‡å®šã—ã¦ãã ã•ã„。
'bzr diff --summarize' ã§ã‚‚見るã“ã¨ãŒã§ãã¾ã™ã€‚ 変更を部分的ã«ãƒžãƒ¼ã‚¸ã—ãŸã‘ã‚Œã°ã€"merge -i"を使用ã™ã‚Œã°ã€"shelve"ã¨åŒã˜
よã†ã«ãã‚Œãžã‚Œã®ãƒãƒ³ã‚¯ã‚’プãƒãƒ³ãƒ—トã§é¸æŠžã—ã¦é©ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ リダイレクションãŒå¤šã™ãŽã¾ã™ ツリーã¯ãƒ–ランム{1} ã®ãƒªãƒ“ジョン {0} ã§æœ€æ–°ã®çŠ¶æ…‹ã§ã™ã€‚ ã“ã®ãƒ–ランãƒã‚’別ã®ãƒ–ランãƒã®ãƒŸãƒ©ãƒ¼ã«ã—ã¾ã™ã€‚ エクスãƒãƒ¼ãƒˆã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ç¨®é¡ž ライブラリ "%(library)s" をインãƒãƒ¼ãƒˆã§ãã¾ã›ã‚“: %(error)s ä¸æ˜Žãªãƒã‚°ã§ã™ã€‚ %s コミットã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚ スタックã®è§£é™¤ サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„エクスãƒãƒ¼ãƒˆãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ: %s ã“ã®ãƒ–ランãƒã®ãƒŸãƒ©ãƒ¼ã‚’æ›´æ–°ã—ã¾ã™ã€‚ 作æ¥ãƒ„リーを新ã—ã„リビジョンã«æ›´æ–°ã—ã¾ã™ã€‚ ブランム{1} ã®ãƒªãƒ“ジョン {0} ã«æ›´æ–°ã•ã‚Œã¾ã—ãŸã€‚ リãƒã‚¸ãƒˆãƒªã€ãƒ–ランãƒã€ä½œæ¥ãƒ„リーを新ã—ã„フォーマットã«ã‚¢ãƒƒãƒ—グレードã—ã¾ã™ã€‚ 指定ã•ã‚ŒãŸãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«ã‚¢ãƒƒãƒ—グレードã—ã¾ã™ã€‚詳細ã¯"bzr help formats"ã‚’ã”覧ãã ã•ã„。 å•é¡Œã‚’解消ã—ãŸã‚‰ã€bzr resolveを使用ã—ã¦ãã ã•ã„。bzr conflictsã‚‚ã”覧ãã ã•ã„。 çœç•¥å½¢å¼ã§ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã‚’表示ã—ã¾ã™ã€‚ ファイル比較ã«ä½¿ã†ã‚³ãƒžãƒ³ãƒ‰ã§ã™ã€‚ è¡çªã‚’解決ã™ã‚‹ãŸã‚ã«ã€åˆ¥ã®ãƒžãƒ¼ã‚¸æ–¹æ³•ã‚’試ã—ãŸã„å ´åˆã«ã€ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’
使用ã—ã¾ã™ã€‚ä»–ã®ã‚‚ã®ã‚ˆã‚Šå„ªã‚ŒãŸãƒžãƒ¼ã‚¸æ–¹æ³•ãŒã‚ã‚Šã€remergeを使ã£ã¦å€‹ã€…ã®
ファイルã«åˆ¥ã®ãƒžãƒ¼ã‚¸æ–¹æ³•ã‚’試ã™ã“ã¨ãŒã§ãã¾ã™ã€‚ 空ã®ãƒ–ランãƒã‚’ä½œã‚‹å ´åˆã‚„ã€æ—¢å˜ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã‚’インãƒãƒ¼ãƒˆã™ã‚‹å‰ã«ã“ã®
コマンドを使用ã—ã¾ã™ã€‚ デフォルトã®è¦ªãƒ–ランãƒã‚’使用ã—ã¾ã™ã€‚: %s
ä¿å˜æ¸ˆã¿ã®è¦ªãƒã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’使用ã™ã‚‹: {0}
デフォルトã®push先ブランãƒã‚’使用ã—ã¾ã™ã€‚: %s 共有リãƒã‚¸ãƒˆãƒªã‚’使用ã—ã¾ã—ãŸã€‚: %s
作æ¥ãƒ„リーã®æ§‹é€ ã€ãƒ–ランãƒã®ä¸€è²«æ€§ã€ãƒªãƒã‚¸ãƒˆãƒªã®å±¥æ´ã‚’ãƒã‚§ãƒƒã‚¯ã—ã¾ã™ã€‚ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¨ãƒ©ãƒ¼ è¦å‘Š: --clean-obsolete-packs を使ã£ã¦ã„る最ä¸ã€
ã‚‚ã—ãã¯å†ãƒ‘ック直後ã«ãƒžã‚·ãƒ³ãŒã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã—ãŸ
å ´åˆã€å‰Šé™¤çµæžœã¯ãƒ‡ã‚£ã‚¹ã‚¯ã«æ›¸ãè¾¼ã¾ã‚ŒãŸã‚‚ã®ã®ã€
æ–°ã—ã„パックãŒæ›¸ãè¾¼ã¾ã‚Œã¦ã„ãªã„状態ã«ãªã£ã¦
ã—ã¾ã„ã¾ã™ã€‚ã“ã®å ´åˆã«ã¯ãƒªãƒã‚¸ãƒˆãƒªã¯ä½¿ç”¨ä¸å¯èƒ½ã¨
ãªã£ã¦ã—ã¾ã„ã¾ã™ã€‚ 注æ„: 以下ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚Œã¦ã„ã¾ã™ãŒã€ç„¡è¦–パターンã«ãƒžãƒƒãƒã—ã¾ã—ãŸã€‚:
%s
ã“れらã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€'bzr remove'ã—ãªã„é™ã‚Šã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚ŒãŸã¾ã¾ã§ã™ã€‚
誰を作者ã¨ã—ã¦è¡¨ç¤ºã™ã‚‹ã‹ - firstã€allã€ã¾ãŸã¯committer 外部ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã«ã‚³ãƒŸãƒƒãƒˆã™ã‚‹ã¨ãã«ã€ãƒã‚¤ãƒ†ã‚£ãƒ–ã«è¡¨ç¾ã§ããªã„データをプッシュã—ã¾ã›ã‚“。 ブランãƒã‹ã‚‰ãƒžãƒ¼ã‚¸ã™ã‚‹å ´åˆã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§bzrã¯è‡ªå‹•çš„ã«å¦¥å½“ãªãƒ™ãƒ¼ã‚¹ãƒªãƒ“ジョンを
判定ã—ã€ãれ以é™ã®ã™ã¹ã¦ã®å¤‰æ›´ã‚’マージã—よã†ã¨ã—ã¾ã™ã€‚ã‚‚ã—ã“ã‚ŒãŒå¤±æ•—ã—ãŸå ´åˆã¯ã€
明示的ã«ãƒ™ãƒ¼ã‚¹ãƒªãƒ“ジョンを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ メッセージãŒæä¾›ã•ã‚Œãªã„ã¨ã〠メッセージエディタã§ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã®è¦ç´„ã¨ä¸€ç·’ã«å·®åˆ†ã‚’表示ã™ã‚‹ã€‚ Bazaarã®ãƒ¡ã‚¸ãƒ£ãƒ¼ãƒªãƒªãƒ¼ã‚¹ã®å¾Œã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆãŒå¤‰æ›´ã•ã‚ŒãŸå ´åˆã€
ã„ãã¤ã‹ã®ã‚ªãƒšãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã®éš›ã«ã€ã‚¢ãƒƒãƒ—グレードã™ã¹ãã§ã‚ã‚‹ã¨é€šçŸ¥ã•ã‚Œã¾ã™ã€‚
æ–°ã—ã„フォーマットã¸ã®ã‚¢ãƒƒãƒ—グレードã«ã‚ˆã£ã¦ã€ãƒ‘フォーマンスãŒæ”¹å–„ã•ã‚ŒãŸã‚Šã€
æ–°ã—ã„機能ãŒä½¿ãˆã‚‹ã‚ˆã†ã«ãªã‚‹ã§ã—ょã†ã€‚ãŸã ã—ã€å¤ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒªãƒã‚¸ãƒˆãƒªã‚„
Bazaarã¨ã®äº’æ›æ€§ã«ã¯åˆ¶é™ãŒç™ºç”Ÿã™ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 ファイルåを指定ã™ã‚‹ã¨ãã¯ã€ç¾åœ¨ã®ãƒ•ã‚¡ã‚¤ãƒ«åã‹ã€å¯¾è±¡ãƒªãƒ“ジョン時点ã§ã®ãƒ•ã‚¡ã‚¤ãƒ«
åã‹ã‚’使ã†ã“ã¨ãŒã§ãã¾ã™ã€‚ã¤ã¾ã‚Šã€ãƒ•ã‚¡ã‚¤ãƒ«å指定ã§ã€Œå‰Šé™¤ã®å–り消ã—ã€ã®ãŸã‚ã«
revertを使ã†ã“ã¨ãŒã§ãã¾ã™ã€‚ディレクトリを指定ã—ãŸå ´åˆã¯ã€ãã®é…下ã®ã™ã¹ã¦ã®
変更ãŒå–り消ã•ã‚Œã¾ã™ã€‚ 作æ¥ãƒ„リーã«è¡çªãŒã‚ã‚Šã¾ã™ 指定ã•ã‚ŒãŸãƒªãƒ“ジョンã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容を標準出力ã«æ›¸ã出ã—ã¾ã™ã€‚ リビジョンＩＤã¨--revisionã®ã©ã¡ã‚‰ã‹ä¸€ã¤ã ã‘を指定ã—ã¦ãã ã•ã„。 å¤ã„リビジョンã«ä¸€æ™‚çš„ã«ç§»å‹•ã—ãŸã‚Šã€ãƒ–ランãƒã‚ˆã‚Šå¤ããªã£ã¦ã—ã¾ã£ãŸä½œæ¥ãƒ„リーを
最新ã®çŠ¶æ…‹ã«ã—ãŸã‚Šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ 軽é‡ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã‹ã‚‰ä½œæ¥ãƒ„リーを削除ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 リモートã®ä½œæ¥ãƒ„リーを削除ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 NULLリビジョンã¯æŒ‡å®šã§ãã¾ã›ã‚“。 Bazaarã®ä½œæ¥ãƒ„リーã¯ãã‚Œãžã‚Œãƒ™ãƒ¼ã‚¹ãƒªãƒ“ジョンをã²ã¨ã¤ã ã‘æŒã£ã¦ã„ã‚‹ã®ã§ã€
ファイルやディレクトリを個別ã«æ›´æ–°ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。もã—ã€æ‰‹å…ƒã§å‰Šé™¤ã—ã¦
ã—ã¾ã£ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…ƒã«æˆ»ã—ãŸã„ã®ã§ã‚ã‚Œã°ã€'bzr update'ã§ã¯ãªã'bzr revert'ã‚’
使ã£ã¦ãã ã•ã„。もã—ã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®çŠ¶æ…‹ã«æˆ»ã—ãŸã„ã®ã§ã‚ã‚Œã°ã€
'bzr revert'ã« -r オプションを指定ã™ã‚‹ã‹ã€'bzr cat'を使ã£ã¦å¤ã„内容を書ã出ã—ã¦
ãã ã•ã„。 --revisionã¨ãƒªãƒ“ジョンＩＤã®ã©ã¡ã‚‰ã‹ã‚’指定ã—ã¦ãã ã•ã„。 ãƒãƒ¼ã‚«ãƒ«ã§è¡Œã£ãŸå¤‰æ›´ã¯ã€'bzr status'ã§ã¯ãƒžãƒ¼ã‚¸ä¸çŠ¶æ…‹ã«ãªã£ã¦ãŠã‚Šã€'bzr commit'ã§ã‚³ãƒŸãƒƒãƒˆã§ãã¾ã™ã€‚ added
作æ¥ã‚³ãƒ”ー内ã§ã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚Œã¦ã„ã‚‹ãŒã€ä¸€ã¤å‰ã®ãƒªãƒ“ジョンã§ã¯ç®¡ç†
ã•ã‚Œã¦ã„ãªã„。 %s ãŒè¿½åŠ ã•ã‚Œã¾ã—ãŸã€‚
ブランãƒã«ã¯%sã¨ã„ã†ãƒªãƒ“ジョンã¯ã‚ã‚Šã¾ã›ã‚“。
bzr update --revisionã«ã¯ã€ãƒ–ランãƒå†…ã®ãƒªãƒ“ジョンを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ bzr %s --revision ã«ã¯ã€ãƒªãƒ“ジョンＩＤを一ã¤ã ã‘指定ã—ã¾ã™ã€‚ bzr %s --revision ã¯1ã¤ã¾ãŸã¯2ã¤ã®å€¤ã‚’å–ã‚Šã¾ã™ã€‚ bzr %s ã«ã¯ã€ç•°ãªã‚‹ãƒ–ランãƒä¸Šã®2ã¤ã®ãƒªãƒ“ジョンã¯æŒ‡å®šã§ãã¾ã›ã‚“。 bzr alias --removeã«ã¯ã€å‰Šé™¤ã™ã‚‹ã‚¨ã‚¤ãƒªã‚¢ã‚¹åを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ bzr cat --revisionã«ã¯ãƒªãƒ“ジョンをã²ã¨ã¤ã ã‘指定ã—ã¾ã™ã€‚ bzr diff --revision ã«ã¯ï¼‘ã¤ã¾ãŸã¯ï¼’ã¤ã®ãƒªãƒ“ジョンを指定ã—ã¦ãã ã•ã„。 bzr status --revisionã«ã¯ã€ï¼‘ã¤ã‹ï¼’ã¤ã®ãƒªãƒ“ジョンを指定ã—ã¾ã™ã€‚ bzr update --revisionã«ã¯ã€ãƒªãƒ“ジョンをã²ã¨ã¤ã ã‘指定ã—ã¾ã™ã€‚ bzr updateã¯ã€å€‹ã€…ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚„ディレクトリã§ã¯ãªãã€ä½œæ¥ãƒ„リー全体を更新ã—ã¾ã™ã€‚ ブランãƒã® root ã¯ç§»å‹•ã§ãã¾ã›ã‚“。 --from-rootã¨PATHã‚’åŒæ™‚ã«æŒ‡å®šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 format {1} ã®ãƒ–ランム{0} ã‚’ãƒã‚§ãƒƒã‚¯ã—ã¾ã—㟠ツリーã®çŠ¶æ…‹ã‚’リセットã§ãã¾ã›ã‚“ã§ã—ãŸã€‚{0} 検出ã•ã‚ŒãŸã‚¨ãƒ©ãƒ¼: %s ignoreã«ã¯NAME_PATTERNã‹--default-rulesã®ã©ã¡ã‚‰ã‹ã¯æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ 無視 {0} ("{1}"ã«ãƒžãƒƒãƒ)
kindãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“。 %s 無効ãªç¨®åˆ¥ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸã€‚ kind changed
ファイルã®ç¨®åˆ¥ãŒå¤‰æ›´ã•ã‚Œã¦ã„る。(ファイルã‹ã‚‰ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«å¤‰ã‚ã£ãŸãªã©) logã¯ã€ãƒ–ランãƒã®å±¥æ´ã‚’見るãŸã‚ã®bzrã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒ„ールã§ã™ã€‚
対象ã®ãƒ–ランãƒã¯ï¼‘ã¤ç›®ã®å¼•æ•°ã§æŒ‡å®šã—ã¾ã™ã€‚引数ãŒæŒ‡å®šã•ã‚Œã¦ã„ãªã‘ã‚Œã°ã€
作æ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’å«ã‚€ãƒ–ランãƒã®å±¥æ´ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚
ç°¡å˜ãªä¾‹ã‚’以下ã«ç¤ºã—ã¾ã™ã€‚:: マージã®èµ·ç‚¹ã¯ãƒªãƒ“ジョン %s ã§ã™ã€‚
コミットã•ã‚Œã¦ã„ãªã„変更ãŒã‚ã‚‹å ´åˆã¯ã€--forceを指定ã—ãªã„ã¨ãƒžãƒ¼ã‚¸ã¯æ‹’å¦
ã•ã‚Œã¾ã™ã€‚--forceãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€æœªã‚³ãƒŸãƒƒãƒˆã®å¤‰æ›´ã‚’å«ã‚€ç¾åœ¨ã®ä½œæ¥ãƒ„リーã«
マージ元ã®å¤‰æ›´ãŒãƒžãƒ¼ã‚¸ã•ã‚Œã¾ã™ã€‚--forceオプションを使ãˆã°ã€ï¼’ã¤ä»¥ä¸Šã®è¦ªã‚’æŒã¤
マージリビジョンを作るã“ã¨ã‚‚ã§ãã¾ã™ã€‚ マージã—ãŸäºº: ファイルãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。 変更ã‚ã‚Š modified
ファイルã®å†…容ãŒä¸€ã¤å‰ã®ãƒªãƒ“ジョンã‹ã‚‰å¤‰æ›´ã•ã‚Œã¦ã„る。 無効ãªãƒªãƒ“ジョン番å·ã§ã™ã€‚: %r --messageã‹--fileã®ã©ã¡ã‚‰ã‹ã§ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’指定ã—ã¦ãã ã•ã„。 --message ã‹ --file ã‹ã©ã¡ã‚‰ã‹ã‚’指定ã—ã¦ãã ã•ã„。 python-gpgme ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“。ã“ã‚Œã¯ã‚·ã‚°ãƒãƒãƒ£ã®æ¤œè¨¼ã«å¿…è¦ã§ã™ã€‚ removed
一ã¤å‰ã®ãƒªãƒ“ジョンã§ã¯ç®¡ç†ã•ã‚Œã¦ã„ã‚‹ãŒã€ä½œæ¥ã‚³ãƒ”ー内ã§ã¯å‰Šé™¤ã•ã‚Œã¦ã„る。 renamed
ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‘スã¯ä¸€ã¤å‰ã®ãƒªãƒ“ジョンã‹ã‚‰å¤‰æ›´ã•ã‚Œã¦ã„る。
内容も変更ã•ã‚Œã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚る。親ディレクトリãŒå¤‰æ›´ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚‚
å«ã‚€ã€‚ repeated file texts
ãƒã‚§ãƒƒã‚¯ã—ãŸãƒªãƒ“ジョンã®ä¸ã«ã‚ã‚‹ã€é‡è¤‡ã—ãŸãƒ†ã‚ストã®æ•°ã§ã™ã€‚
ファイルã®ã‚¨ãƒ³ãƒˆãƒªãŒå¤‰æ›´ã•ã‚ŒãŸãŒã€å†…容ã¯å¤‰æ›´ã•ã‚Œã¦ã„ãªã„å ´åˆã«ã€
é‡è¤‡ãŒç™ºç”Ÿã—ã¾ã™ã€‚ã“ã‚Œã¯å•é¡Œã§ã¯ã‚ã‚Šã¾ã›ã‚“。 revisions
ãƒã‚§ãƒƒã‚¯ã—ãŸãƒªãƒ“ジョンã®æ•°ã§ã™ã€‚ã“ã‚Œã¯å•é¡Œã§ã¯ã‚ã‚Šã¾ã›ã‚“。 {0} をスã‚ップ ({1} ã® {2} byte より大ãã„ãŸã‚) 複数ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’移動ã™ã‚‹æ™‚ã¯ã€ç§»å‹•å…ˆã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚Œã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。 unique file texts
ãƒã‚§ãƒƒã‚¯ã—ãŸãƒªãƒ“ジョンã®ä¸ã«ã‚ã‚‹ã€ä¸€æ„ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®æ•°ã§ã™ã€‚
ã“ã‚Œã¯å•é¡Œã§ã¯ã‚ã‚Šã¾ã›ã‚“。 unknown
ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã•ã‚Œã¦ãŠã‚‰ãšã€ç„¡è¦–パターンã«ã‚‚一致ã—ã¦ã„ãªã„。 unreferenced ancestors
ä»–ã®ãƒ†ã‚ストã®å…ˆç¥–ã ãŒã€ä¸Šä½ã®ãƒªãƒ“ジョンã‹ã‚‰å‚ç…§ã•ã‚Œã¦ã„ãªã„
ã¨æ€ã‚れるテã‚ストã§ã™ã€‚ã“ã‚Œã¯ã€BazaarãŒå¯¾å‡¦ã§ãる軽微ãª
å•é¡Œã§ã™ã€‚ versionedfiles
ãƒã‚§ãƒƒã‚¯ã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ãƒ•ã‚¡ã‚¤ãƒ«ã®æ•°ã§ã™ã€‚ã“ã‚Œã¯å•é¡Œã§ã¯
ã‚ã‚Šã¾ã›ã‚“。 {0!r}ã¯ãƒªãƒ“ジョン{1}ã«ã¯å˜åœ¨ã—ã¾ã›ã‚“。 {0} 㨠{1} ã‚’åŒæ™‚ã«æŒ‡å®šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 {0} è¨å®šã•ã‚ŒãŸ {1} ã®å ´æ‰€ {2}
Copyright © 2017 || Recoded By Mr.Bumblebee