-=[ Mr. Bumblebee ]=-
_Indonesia_
2 I [ <
: ) ( H $ q 2 $ & 5 B D * : ; ) 8 J 0 n R # ~ v x 0 ~ c ? * + 2 % O u o ) ' Q . C [ % w # ! + M m A # & " ; y X ' + ( H 9 q 1 < U ' q ? Q + 4 m H r ` ) ( R < T h * < V ( v ( G E e V W R A g 2 8 + / : - j ; ; I + Z A ' i < 0 I / y - ' = > D < O < > C % l i A 8 v ` C E T ! K P Q Y O
W J ! 5 1 W L C < 4 W % / P f & , K e _ / 1 H ` d , ' 8 = x w 3 f ? F R > Y < 2 o V Z I , 0
>
L % . r p 3
F
g ( ; 8 d + % - 8 = @ v 4 7 D $ Q i % : 8 E :
B
| / Z 3 _ Q! I a! ! _" ~" # " " o T# 5 # # $ M $
& P & & + ' ' ( )( 3 H( |( ) ) ) ) ) * + F - N U- @ - = - 9 #. c ]. H . +
/ 6/ K W/ / / / / + 0 ! ;0 ]0 # G1 k1 2 04 - 4 8 4 9 35 m5 `6 6 R 7 7 c8 + K9 ? w9 9 _ J: b : 6
; ! D; A f; ; ! =< w _= ? @ 7 A Y OA A 4 qB B * 8C cC * +D VD nD JE E " E H F WF J G { ]G G J , M / N F N ? /O ' oO 4 O < O m P 0 wP . P * P / Q & 2Q 3 YQ 5 Q 8 Q Q @ R , ZR R R R
R R + R ( S : BS ) }S S S S 6 S !T ;T RT , sT T
T T / T U (U ! BU dU & {U ( U 4 U $ V ( %V 7 NV Y V V V Y W W E yX X i X - 3Y 8 aY Y > 2Z qZ [ < [ T [ / .\ N ^] ] j^ Y_ ` w a a _ b P b : =c Y xc c Wd Y vd d Se qe - e ! e x e [f . f 4 g 9 Gg W g G g H !h + jh $ h S h i H i ( i I j Mj J hj 5 j 8 j : "k ]k { m A m . m ] m - \p . p % p $ p 6 q | ;q q zs W| F ,} s} l }} } } ~ ~ 5 A J [
p A { . ) 3 P 8 3 r l 8 ߁ ) ] B c ̓ ރ
4 E U
a
o
z
8 c F \
c n t # h 3 I / > n 6 ' p F B u K ̛ D t ] J Ҝ 7 < ) M B 0 1 s ` # $ H 5 J f 4 ! ' ަ ˧ ߧ = j ; ' G Ω h U @ o X A ܮ f {
3 ( A $ j 6 4 Ʊ ) % I 1 % { % c = t Ѵ ; F / 5 Ƶ + ! M ' ] Ѷ ! ! A a q ! ٷ % , ! F N $ ) @ T j A C I E ( : [ ) ! ! $ ' ! + ' M k u S 5 N s V D ! ^ /
! + $ ] @ K 3 J J i & , @ I B ^ K E ; M
> , / \ @ o W c p S j 7 e 4 c c N K [ A G z J v + H ' D , q ' h O 0 F D F I K # G o L f n k 6 + = F 8 P # \ O
; Z + H ! 2 ? = r ? 6 = ' e $ 5 ( y 9 : . 7 $ \ - ; , h 2 6 8 A Z w ( P n O X r # # C 7 9 D & ~ . . 6 % 1 ` W ) ) ( / ; ; w ` #
G
.
! - A o 3 # ( 3 / \ < * ' m
8
K
, / M \ C 8 ' | ' 9 , ! 3 ? U Q % w F > b 1 + 0 @ X I d T " w a N K % J & ) + P ) | ' % 5 I i 1 / ( E n , s % 1 . E ' t s ( 9 : N ; A ; 8 C ) | * Q ! Y! , q! / ! , ! . ! # *" @ N" 5 " - " / " 6 ## ( Z# # # 0 # & # 2 $ G$ L d$ $ ( $ R $ D I% 2 % % 3 % & 0& K' ? ( W Z) * + 4 + + p + j, A , - 8- 4 f- - * - % - . " . C. " b. . 5 . . O . + :/ % f/ / F / & / G 0 `0 + 0 2 0 ) 0 7
1 B1 6 c1 : 1 1 1 $ 1 2 82 > P2 " 2 V 2 3 3 ' 3 R C3 R 3 ) 3 4 ,4
A4 O4 a4 u4
4 4 % 5 5 5 . 6 U 7 P9 G : c: > ; - C;
q; ; r y< y < 4 f= = _> b ? [ i@ d A *B ? B A C / DC ! tC p C D # D + D E ; ;E 1 wE - E & E ! E 5 F . VF H F G G 0 G G ,H tH , I ( -I VI 0 kI I I E I J K L . {M M M N O . P b Q F *R H qS S [ T T U p &V q V W ) W [ X vY t lZ f Z 7 H[ E [ [ l \ ] ] j D^ | ^ @ ,_ m` Ha b b Ec d e Lf E Hg w g i j l l fm x 2n b n o p w q zq r s t zu Tv @ w Mx o x N jz ! { | E ]} ~ v Q b E 3 ; D o l Ĉ O 1 B t ċ # 9 ' ] q 0 < k + Ñ r i _ C X ! ( 9 H W ( * ݙ ) " 2 . U # ! ʚ ! ( 5 = R - S Л $ 7 V # 5 I ] q ם $ 7 J ] p Ӟ 0 > ] ~ { > ; Z 2 9 ɠ B ) F ! p 7 ʡ ! 3 6 ;
r v Y L h H K @ J ? ˤ \ ) ީ O j = 0 ) * 8 % c ] 3 . : B + } a ɭ + 0 * G U r < ȱ , 2 M 6 h ( Ȳ
4 , : g ! ! 3 U _ q \ Ѵ . F G ] o )
A & L s < ϶ 5 1 % W 8 7 ! p ) . ɸ 1 ) * " T * w 2 % չ V i v A V * ; L h ' _ _
% ? 9 ` Q
R ' z & 7 Q ! + . " 4 Q + " F U l $ e % ! % & & . F u q L a { 8 ^ ` R : 9 # B 3 f C 8 * , ? ! l $ # $ $ b ; * ! , G 0 [ # # ( E ! a _ , r ) # # < [ * o 3 [ * ] H % n ` F W i U 2 4 $ H C z ' $ ! ) 1 / A a w 1 6 h < / P Z ) $ + 5 a # w 0 7 + 0 . . O d B ! ) d o H _ 5 ~ = 0 9 # : ] ) E > $ 2 c . 2
1 p Y s A D Z z ; & , S j ; . H e 9 . 1 { / / " 7 ! V / x " 0 & N u C : %
? 4 M 0 & ; # : ^ w 5 Y F N J ( 5 A ? J 8 9 ' ? g p Q
5 @ # d d d % . T g z " - . 8 = v . # . F
5 Q ( ! " u B ; ' @ > % P ( _ < & # @ < 8 u = / : B < } 7 8 3 +
_
L j
@
5
- . \ x ! : \ # p
+
# $ 3 K X @ ` * 6 , 0 0 ` a
& $ R 7 H H ! d . 0 4 J 8 f T b < W ( - { \ B I I F 1 0 H D y * O 4 k % . . C d D $ .
< X + k 7 < ' ? A + " 3 ) 0 ] 7 5 6 3! , O! ' |! ! 6 ! ! ) " C" 8 X" 2 " & " * " d # ! {# ! # ? # # j $ R >% % #& R ( i( ( B ( F ( " ) E ?) H ) C ) y * 5 * I * 4 + A+ R+ , c+ 3 + 4 + + k , r, 1 , ( , , 3 , )- B- `- v- & - * - ? - &. =. ( ^. . v . < / W/ E / # 60 % Z0 K 0 w 0 D1 9 ]1 1 !2 w ?2 ( 2 1 2 : 3 B M3 3 @4 4 @ 5 o 5 ? Y6 6 c7 78 H 8 y H9 9 v E; ; ' _< < * < < u < ' Q= B y= z = E 7> B }> > ? # g@ @ @ j @ .A . A ` B > cB u B C C A TD < E P E J $F 4 oF " F I F > G a PG Q H n I m sI M I 6 /J 2 fJ % J B J ' K & *K j QK C K h L iL C M DM M N 3 zO O O P h Q E R 7 RR % R R , 3S `S T J T x U U X M vZ U Z : [ ? U\ k \ ] E ] , ] ] ^ + ^ C ^ ` ` q b &c = >d S |d . d , d 3 ,e T `e e 3 Jg U ~g ? g j h h i s i J Wj A j " j k U k q (l p l m m Xn B 4o I wo N o p d p 7q 8 Wr l r s t #u D u 8 v @ Kv 7 v h w -y . y z c z " z | | } 5~ ~ o 0 i ր ~ @ [ A 7 2 É ~ V m Պ | C g ( q W b B m } c ! = A Ô ( D N P ' 8 ޖ " 5 0 X 1 R ٗ , , G t 3 ʙ _ O 5 o [ ~ J Q 4 4 1 i @ ܞ " # š D $ . ) S @ } 3 ? $ 2
W > b 0 ߣ S % d ( Ӥ % + ! ? M B Х ݥ , G B 6 . G 8 U o " L q Ш Q @ = h ~ ( , F ! g C
[
r K % ̮ G ï - ) W 3 v ] ` - " ó " k T 8 D / t j / R _ D ^ ^ C ] \ j O 2 D 7 z
S P ? = [ / B G
O r ] <
U r n 4 s A m > 3 4 # h : ! 2 \ / m v H G g J L 1 R = + + F r I x q
5 + @ l 2 % A M _ k 1 - 7 + * c : . 7 @ 0 > q 3 s B 0 C @ _ + ) / 9 * U ( $ ! ! ( = P # d # / #
%
=
[
f
# v
%
f { " ! b ] f { ' '
J !
6 l
=
, C O J Y ; S ! o z I % H % n
: "
% 0 B P ' ?
) J ! t - 0 F Z n + " : P d v F 0 @ H L
^
S a i
) 5 P _ , A 1 _ F ! # , J % R + x 9 5 O # n # ) F # Z ~ B % 7 B % h . = @ ~ $ j! ! i ! *
" 8" /# + )$ U$ e $ u B% n % P '& T x& 0 & &
'
' "' W 3' $ ' '
' ' " ' 2 ( d >( , ( * ( @ ( 9 <) ! v) J ) ) ) * 1* C* , c* * *
v, , : , , , ( - $ >- 2 c- - $ - - & - . B . * T. : . ; . . 8 / 0 P/ n / R / ~ C0 0 x 0 0 \1 ~ 1 c 3 p4 4 6 6 6 + 6 6 % 7 B7 o X7 7 7 ) 7 8 8 8 8 9 (9 % D9 j9 9 # 9 9 9 : ! : ; ;; A Y; # ; & ; " ; < y &< < < ' < < ( = 9 ?= y= 1 = = < = #> ' ?> ? g> Q > > @ @ @ A m A H @B B ` D ) E G G < H T I 6K * K
L $L ( DL ( mL G L E L e $M W M R M A 5N 2 wN 8 N N O / P - 8P < fP ; P I P + )Q UQ A Q 8R < R R I S HT dT - T ' T = T > U < RU U V W W < xX > X C X l 8Y A Y Y Z 8 E[ ` ~[ C [ E #\ ! i\ K \ P \ Q (^ O z^
^ ^ W a_ J _ ! ` 1 &` L X` C ` < ` 4 &a [a % wa a a a a a a b 5b Vb cb vb b b & b , b c 4c Tc _ pc / c d d ` 3d , d ' d d 8 ne = e x e ^f qh h h h i j ak k w l f zl ? l F !m > hm Y m < n >n %o Z p sp p q > r L r . Bs p qt 3 t u v 7x ( y 8 4z + mz z % z - z 8
{ @ F{ 4 { 7 { D { Q 9| % | | : | } E }
~ ځ B Ƀ
L W Z _ I 0 z . M # Z ~ o # 5 ɋ s M ٍ P ] + ŏ 3 K W p ɑ c Z F ݔ N $ @ s = 9 c , H + ٖ K & r ė + ޗ !
, # : - 8 ɜ 9 < / R ^ 2 + ? F _ b y 6 ܢ ! A 5 w ! w . ? 7 Y x 4 @ u * 2 * % = " H ݭ & J { , , Z / F ? ' > 4 f < m ط 0 F . w * / Ѹ & 3 ( 5 \ 8 ˹ @ , ) V c w
+ ( : ) L v 6
! , B o
/ ڼ ! 3 & J ( q 4 $ Ͻ ( 7 Y U þ Y a E H j . 8 2 k > B < m T / N / ~ ; * w f _ ] P : Y I ( Y G $ B - c ! x , . 4 9 W R G H + ; $ g S H b ( I J 9 5 8 : . { A ^ . ] - - . [ % $ 6 | K ( F D l N U q ,
A A L . ) U 3 P 8 r = 8 ) ] q c m y
&
2
@
K V _ h u 8 | c /
6 A t k s | ; h / B 6 p B u Y K D t 1 J
) M B
1 D
` v
#
f l ! ' = j ' w G h P U @ @ X t A k W f L
( $ ; 6 ` 4 ) I % L r % 4 Z t ; S / g 5 + ' . V l ! 2 B W p ! % , F f u ) ! T ;! A ! C ! I # `# # : $ ,% & ' ) * ! W+ ! y+ + $ + ' + ! + ' , l F, S - . . N E/ V / D / ! 00 / R0
0 ! 0 + 0 0 0 ] 1 K p1 3 1 J 1 J ;2 & 2 2 2 , 2 3 3 B 03 s3 K 3 E 3 ; 4 [4 n4 4
4 > 4 4 , 5 .5 5 @ p6 7 A8 X 8 c C: : ; `< '= j > v> > e > ? @ c A c "B B C C /D D A YE E vF G [G z G H H v I vJ K K L M D N O O q Q S h T #V W W F X D X F Y dY K Z G C\ L ] f ] n ?^ 6 ^ + ^ _
_ 8 &_ # __ \ _ O _ ; 0` + l` H ` ` ` 2 a = Ha ? a 6 a = a ;b $ Xb 5 }b ( b y b 9 Vc : c . c 7 c 2d d - d ; e >e \e 2 te 6 e 8 e f 0f Mf if f f h h h ( h P h Di O i .j Hj # Zj # ~j j C j j
k 9 k & Tk . {k . k k l 6 l % m ` -m m ) dn ) n ( n / n ; o Mo 6p # Vp zp `r G r . r r - s Es 3 s s ( t / 2t < bt * t ' t m t 8 `u K u u , v M 2v v C w ' Rw ' zw 9 w , w ! x ? +x kx Q x My F y > 8z 1 wz z z + z { { .{ I :{ | o} ~ ~ ~ ~ ~ T ~ M a $ K ҁ % v J & + & ) R | ' Ƀ ݃ ? _ q 1 ք / ( D , Z s . ' J s r ( : $ ; _ A ; ݇ 8 ) R * | È Q ݈ / , G / t , . щ # @ $ 5 e - / Ɋ 6 ( 0 Y x 0 & Ë 2 L : ( R ̌ D 2 d 3 ! ? W 0 c 4 ~ p ϓ @ A ̔ - 4 < q * % ؕ " " 8 [ 5 x O + % < b F & Ǘ G 6 + W 2 ) 7 6 9 : p $ ʙ > & " e V ߚ ' R R l )
% 7 K
] k % f . U П & G 9 > ڢ -
G U r O y ¤ 4 < q 5 b ܦ [ ? d ? A ت / ! J p l ݫ # + Ǭ ; 1 M - & ! ԭ 5 . , H [ 0 ѯ G J , ְ ( , 0 A r E r . Q M ζ u . n b F H G [ l ȼ u p q m ߾ ) ƿ [ L t B f 7 E V l p z j | @ C " E w d h < x b w P ] m P * @ # o N @ ! E 3 y L ' b 3 D E \ l O B W t # ' 3 [ q o 0 k H ? 5 C . ! ( H - v ( * ) " . + # Z ! ~ ! ( = ( f - x S
, 3 G [ o
3 F Y l 0 > 3 ~ Q > ; 0 2 l 9 B ) ! F 7 h ! 3 6
H
V
v m
Y
L > H K @ ? a 2
O @ = 0 * % 9 ] _ 3 : + S a * U H < , # 6 > ( u
4 , = ! + _ G \ G 3 o {
& " I < h 5 1 - 8
! F h ) u . 1 ) ! " *! * M! 2 x! % ! ! V ! ?" " v # A ,% n% * % % % ; % "& >& ' 5' ]' _ s' ' ' % ' ( 9 6( Q p( ( ( R ( P) g) & q) 7 ) ) Q X* ! * + * . * 4 '+ + \+ + + " + F + +, B, $ ;- % `- ! - % - & - & - . . K. c. q x. L . 7/ Q/ l/ 8 ~/ / ^ / ` (0 0 : 0 9 0 # 1 3 <1 C p1 8 1 1 2 , 2 ! B2 d2 $ ~2 # 2 $ 2 $ 2 b 3 * t3 ! 3 3 3 3 4 4 0 14 # b4 # 4 4 4 4 4 5 ! 75 Y5 p5 56 , H6 u6 6 ) 6 # 6 # 6 7 17 7 * n8 o 9 : [ : ; ] ; H < E= = ` > F /@ i v@ @ U gA A 3 ZB C C C 4 C $ C H D z eE E F ' oG $ G ! G ) G 1 H A :H |H w H 1 I AI [I < I / )J YJ Z yJ J ) K $ K + L :L # PL 0 tL 7 L + L M . M . M (N =N N N B N ) =O o gO O H O 8P 5 WP = P 0 P 9 P : 6Q ) qQ Q E Q > Q 2 <R . oR 2 R R R S 1 T p T eU 2V LV A fV D V V W Z SX X ; X & Y ,Y CY ; ^Y . Y H Y e Z . xZ Z 1 T[ / \ \ / \ \ ] ! /] / Q] ] ] ] " ] ] ^ & '^ N^ l^ C ^ : ^ ^
_ 4 &_ [a Xb hb 0 b & b ; b # c 7c Pc fc }c 5 c Y c F 'd J nd ( d 5 d A e J Ze 8 e 9 e ' f @f If Q ff
f 5 f @ f d =g d g % h -h @h Sh " hh - h h . h h 8 i Oi . ai # i . i F i 5 *j ( `j j j ! j j j j u l ; l l l ' l @ m % Xm P ~m m ( m _ n & un n # n @ n < o No _p xp = p p / p : q < Vq 7 q 8 q 3 r
8r L Cr @ r 5 r - s 5s Qs ]s ! t 5t # It mt t t t u u + u # u $ v K 1v }v @ 9w * zw 6 w , w 0 x ` :x
x & y $ y y R z cz }z z H z H z ! ={ . _{ 0 { 4 { J | 8 ?} T x} b } < 0~ ( m~ ~ ~ - T \ B I " l { F À
0 ! D R * O 4 D y % . . = D [ $ . 1 + D p 7 < Æ ? Z { + Ƈ " ߇ 3 0 6 7 g 5 6 Ո , ( ' U } 6 ҉ ) 8 1 2 j & * Ċ d ! T ! v ? ؋ k R k S D e B m F " E H ` C y 5 g I 4 - , > 3 k 4 ԓ k M 1 e ( 3 Д ; Q & o * ? ( 9 b v ~ < 2 E ˗ # % 5 K [ w 9 8 r w ( 1 : B ( k Ϝ A o ŝ ? 5 u ? H ۠ y $ v ! ' ; c * z u ' - B U z E B Y k # C g j
. ` ީ > ? u ~ A 0 < r P J 4 K " I > a , Q n m O M 6 2 B % u B ' & j - C h ܳ E C ܴ 3 X h E 7 0 % h , > J x i M T U : ? 3 k s E f , k + C } q = S Y . , 3 T = 3 ' U [ ? j \ s J 4 A " U q p w 5 B I T N d 8 4 l m i D 8 @ ( 7 i h
. c n " d j o e 0 i ~ [ A 2 ~ 3 m | g q 4 b J } c = b A ( ! N - | ' 8 " 0 5 f p 1 R , $ Q c 3 s _ O 5 L 8 ~ J t Q 4 1 F @ x f " # D $
) 0
@ Z
3
?
$
4 > ? ~ 0 S % A g ( % + ? *
B j
G 6 g . G 2 L " m L O Q @ h \ (
$ ! E g C
[
P K ^ % G - 5 3 T ] ` " l " I l T 8 D
R p! j
" x" 0# # $ _ % "& ^ <' ( C ;) * \ H+ O + + |, e- 2 . "/ 7 / z /
j0 S x0 P 0 1 = 91 w1 / 1 1 B 2 G 2
-3 r ;3 < 3
3 U 5 r L6 4 7 s 7 A h8 8 m e9 > 9 3 : # F: j: : ; 2 :< / m< < m T= = H = %> g (? ? *A A 1 B R C oD D + D + %W QW I WW W ^_ h_ t_ _ q _
` + ` K` b % i j ,j _ Jj 1 j - j 7
k * Bk : mk . k 7 k @ l > Pl l 3 Rm B m 0 m C m @ >n + n ) n n n o o * 4o ( _o $ o o o ! pp p ! p p p q q /q # Cq # gq / q q q # q r r
:r Er # Ur % yr r
r r r f r Zs " xs s ! s b s <t Et Zt at pt xt ' t ' t t J u 6 Ku = u u u u v "v .v J 8v v v v v v v v w 2w ! Nw pw Yx ox x x x I x % 'z % Mz sz
|z z z : z " z
{ { B /{ r{ |{ { { ' { ? { ) )| ! S| u| - | | | | } %} 9} M} k} } } } + } ~ ~ /~ C~ U~ k~ ~ F ~ ~ ~ @ ' h L x
^
2 @ H ) P > , A _ % ! Ƀ # ) % 1 + W 9 Մ . # M # q ) օ F # 9 ] B c % 7 ̆ B G d x
= ] r $ I n i * + 4 e u ! n P T W 0 ݎ
W $ j
" Ǐ 2 d , * @ ڐ 9 ! U J w ّ " , B o W s * B } > P Q _ Y l \ 1 l N k $ F h 2 O \ l 3 {
W > O " C ' B + C R _ z [ T q p 4 C
a H Y w n " P ( T J U s o % } ] ;
b p 3 `
^ C 8 7 | G 7 u . = m 8 I ~ - y E G ( < + & = e w + ' % ) [ r f - ^ b ] 4 V D 6 . x 3 \ 1 5 p Q u I R M Q ] m t ? k e \ p F 5 ? c G + ' D ~ f g D { + ! , %
j y _ ' H J R x v C < L p ) V T O o 0 : G 6 : g R A N / W f % ~ 3 Z l [ b ; , @ g J D u K V Z U B s H P ' L S ( E _ $ . - / 4 i 3 P T r - ! | " ? Y N v 9 [ < d z K : ~ - P b B s
/ U Y r u % _ w ! " L
w " V e C d j 5 ! & . 9 ; " L f a K J q I i < @ ^ 5 k a 5 ~ g < y ^ E 6 " R * H y C f X S ! u o 1 S 9 S B + 8 3 & O ]
v x X p R t u 7 & t Q
" $ N i Z r ) , m * D $
# N j v u ) d 8 #
] N # > d r $ } x > v ~ n T T h g ) @ A W ? H 4 _ v | . 8 - B z ( $ ` g G / O @ l z }
n E R h
J V = d 7 $ ? R = ] 6 = D I < t a t ? 8 Q | \ 7 & F F M 7 M . w 8 ~ * \ 1 $ p w 2 4 A k S X # d K 6 O K x
L
k } L : l Q q G
5 3 } w s E { , } i ; _ f v q ? j , . . y d 4 y - h < V z ^
# E A @ / r x f n { D = X - m t b 2 g X ( ; n # G P n # M A W ' q 6 a
& J v 1 X O 3 h G h < Z 2 Q o O 0 C _ * K m K h 2 5 e I i ` Y [ 0 j P ( n U @ @ Y / z r + 8 > ~ 4 z D 9 y / # u 1 c x ; r b | Y J ; [ 6 i 5 % + U & W b 6 } 4 L m F S U ) Z \ @ > ^ H ( c a ? T [ + ! Z f b " z A ` n I
P + A t N ! Z & * k P 0 M \ j J - g * M 1 c 0 U J > = E ) m T 1 2 l t ] : S s V 1 c Z { / E | D g F y s F . % k * x a q a o ! S * q , ( A X v ( R k 4 n 0 2 h S 7 I | M ^ / p " B ' a L o T ' 2 { < ` E % e ~ ) U , 0 d I ` ^ 0 F $ d C N h 2 j 1 9 : Q s W ( K W { , i W H % ? c z ` ` U X = m 7 t e ; $ & G > o { M l H j & A Y L k N * 2 ! 7 r @ e O q ' : o > { ' ) 0 9 B c | q V Z ^ ] M i . l ; 3 0 F e Q b I w p = w ] K 5 H } o c : f # / ! [ x c [ 6 s % # u i Y , 9 V \ , 9
| ` B - e _ 9 j y ) 8 : m X
.. note::
BZR_PLUGIN_PATH
~~~~~~~~~~~~~~~
Branch type specific options
----------------------------
BranchHooks
-----------
Common options
--------------
Configuration files
-------------------
Deprecated formats are shown below.
Enabling content filters
------------------------
Examples
--------
Format conversion
-----------------
Hooks
=====
Impact on commands
------------------
Intent
------
Personal projects hosted outside
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Planned enhancements
--------------------
Refreshing your working tree
----------------------------
SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed
Section options
^^^^^^^^^^^^^^^
See :doc:`formats-help` for more about storage formats.
Source hosting provider
~~~~~~~~~~~~~~~~~~~~~~~
The branch location configuration file, locations.conf
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The main configuration file, bazaar.conf
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
To commit to master branch, run update and then commit.
You can also pass --local to commit to continue working disconnected.
Unicode options
---------------
When you want to pick one set of changes over the other, you can use ``bzr
resolve`` with one of the following actions:
http_proxy, https_proxy
~~~~~~~~~~~~~~~~~~~~~~~ # Pet projects on hobby.net
[hobby]
host=r.hobby.net
user=jim
password=obvious1234
# Home server
[home]
scheme=https
host=home.net
user=joe
password=1essobV10us
[DEFAULT]
# Our local user is barbaz, on all remote sites we're known as foobar
user=foobar # development branches on dev server
[dev]
scheme=ssh # bzr+ssh and sftp are available here
host=dev.company.com
path=/dev/integration
user=user2
# proxy
[proxy]
scheme=http
host=proxy.company.com
port=3128
user=proxyuser1
password=proxypass1 [reference code]
scheme=https
host=dev.company.com
path=/dev
user=user1
password=pass1 [shpnet domain]
# we use sftp, but ssh is the scheme used for authentication
scheme=ssh
# The leading '.' ensures that 'shp.net' alone doesn't match
host=.shp.net
user=joe
# bzr don't support supplying a password for sftp,
# consider using an ssh agent if you don't want to supply
# a password interactively. (pageant, ssh-agent, etc) 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 log -r date:yesterday.. 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 {0} has wrong parents in index: {1!r} should be {2!r} $ bzr diff -r submit: %s should be in the ancestry for: * {0} version {1} has parents {2!r} but should have {3!r} ancestor:/path/to/branch
$ bzr diff -r ancestor:../../mainline/branch before:1913 -> Return the parent of revno 1913 (revno 1912)
before:revid:aaaa@bbbb-1234567890 -> return the parent of revision
aaaa@bbbb-1234567890
bzr diff -r before:1913..1913
-> Find the changes between revision 1913 and its parent (1912).
(What changes did revision 1913 introduce).
This is equivalent to: bzr diff -c 1913 branch:/path/to/branch bzr launchpad-login bzr launchpad-login bob date:yesterday -> select the first revision since yesterday
date:2006-08-14,17:10:14 -> select the first revision after
August 14th, 2006 at 5:10pm. last:1 -> return the last revision
last:3 -> return the revision 2 before the end.
revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789' revno:1 -> return the first revision of this branch
revno:3:/path/to/branch -> return the 3rd revision of
the branch '/path/to/branch'
revno:-1 -> The last revision in a branch.
-2:http://other/branch -> The second to last revision in the
remote branch.
-1000000 -> Most likely the first revision, unless
your history is very long. * The 'lp:' bug tracker alias can expand launchpad bug numbers to their
URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes lp:12345'
will record a revision property that marks that revision as fixing
Launchpad bug 12345. When you push that branch to Launchpad it will
automatically be linked to the bug report. * The 'lp:' transport uses Launchpad as a directory service: for example
'lp:bzr' and 'lp:python' refer to the main branches of the relevant
projects and may be branched, logged, etc. You can also use the 'lp:'
transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk. * The launchpad-login command tells Bazaar your Launchpad user name. This
is then used by the 'lp:' transport to download your branches using
bzr+ssh://. * The register-branch command tells Launchpad about the url of a
public branch. Launchpad will then mirror the branch, display
its contents and allow it to be attached to bugs and other
objects. -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":: <no hooks installed>
Check everything at 'baz':: Check only the repository at 'bar':: Check the tree and branch at 'foo':: Conflict because FILE is not versioned, but has versioned children. Determine the missing revisions between this and another branch:: Determine the missing revisions between this and the branch at the
remembered pull location:: Determine the missing revisions up to a specific revision on the other
branch:: Determine the missing revisions up to a specific revision on this
branch:: 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:: Diffing against this shows all the changes that were made in this branch,
and is a good predictor of what merge will do. The submit branch is
used by the bundle and merge directive commands. If no submit branch
is specified, the parent branch is used instead. Examples:: 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:: It is an error to request the parent of the null revision (before:0). 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:: One way to display all the changes since yesterday would be:: 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/:: Select the revision that last modified the specified line. Line is
specified as path:number. Path is a relative path to the file. Numbers
start at 1, and are relative to the current version, not the last-
committed version of the file. Select the revision that merged the specified revision into mainline. 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:: Supply a datestamp to select the first revision that matches the date.
Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
Matches the first entry after a given date (either at midnight or
at a specified time). Supply a positive number to get the nth revision from the end.
This is the same as supplying negative numbers to the 'revno:' spec.
Examples:: Supply a specific revision id, that can be used to specify any
revision id in the ancestry of the branch.
Including merges, and pending merges.
Examples:: Supply any revision spec to return the parent of that revision. This is
mostly useful when inspecting revisions that are not in the revision history
of a branch. Supply the path to a branch to select its last revision. Supply the path to a branch to select the common ancestor. Tags are stored in the branch and created by the 'tag' command. 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):: The common ancestor is the last revision that existed in both
branches. Usually this is the branch point, but it could also be
a revision that was merged. This is frequently used with 'diff' to return all of the changes
that your branch introduces, while excluding the changes that you
have not merged from the remote branch. 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 Use an integer to specify a revision in the history of the branch.
Optionally a branch can be specified. A negative number will count
from the end of the branch (-1 is the last revision, -2 the previous
one). If the negative number is larger than the branch's history, the
first revision is returned.
Examples:: [/home/jdoe/branches/nethack]
email = Nethack Admin <nethack@nethack.com> [ALIASES]
tip = log -r-1
top = log -l10 --line
show = log -v -p [DEFAULT] [DEFAULT]
email = John Doe <jdoe@isp.com>
editor = /usr/bin/vim
create_signatures = when-required [http://hypothetical.site.com/branches/devel-branch]
create_signatures = always [http://mybranches.isp.com/~jdoe/branchdir]
[/home/jdoe/branches/] [name *.bat]
eol = native [name *.html *.xml]
keywords = xml_escape bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id} bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id} bugtracker_python_url = http://bugs.python.org/issue{id} bugzilla_squid_url = http://bugs.squid-cache.org bzr commit --fixes <id> bzr commit --fixes <tracker>:<id> bzr commit foo -x foo/bar bzr info bzr info -v bzr info -vv bzr ls --ignored bzr mv SOURCE... DESTINATION bzr push :parent
bzr remove-branch repo/trunk bzr view bzr view --all bzr view --delete bzr view --delete --all bzr view --name view-name bzr view --name view-name --delete bzr view --name view-name file1 dir1 ... bzr view --switch off bzr view --switch view-name bzr view file1 dir1 ... cd ~/project
bzr init
bzr add .
bzr status
bzr commit -m "imported project" change_editor = PROGRAM @new_path @old_path debug_flags = hpss debug_flags = hpss,evil email = John Doe <jdoe@isp.com>
gpg_signing_key = Amy Pond <amy@example.com> email = Full Name <account@hostname.tld> gpg_signing_command = /usr/bin/gnpg my_branch_name = feature_x
my_server = bzr+ssh://example.com
push_location = {my_server}/project/{my_branch_name} trac_twisted_url = http://www.twistedmatrix.com/trac $ bzr config mypush
lp:~vila/bzr/832013-expand-in-stack Patterns containing square brackets or spaces should be
surrounded in quotes to ensure they are correctly parsed.
Some of the older formats have two variants:
a plain one and a rich-root one. The latter include an additional
field about the root of the tree. There is no performance cost
for using a rich-root format but you cannot easily merge changes
from a rich-root format into a plain format. As a consequence,
moving a project to a rich-root format takes some co-ordination
in that all contributors need to upgrade their repositories
around the same time. 2a and all future formats will be
implicitly rich-root. ``bzr resolve FILE`` xxx <filename> "John Doe <jdoe@example.com>" $ bzr init
$ bzr mkdir foo
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ rmdir foo
$ touch foo
$ bzr commit -m "THIS"
$ bzr mkdir ../other/foo/bar
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other $ bzr init
$ bzr mkdir white
$ bzr mkdir black
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ bzr mv white black
$ bzr commit -m "THIS"
$ bzr mv ../other/black ../other/white
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other * The connection is via a smart server (accessed with a URL starting with
"bzr://", "bzr+ssh://" or "bzr+http://", or accessed via a "http://"
URL when a smart server is available via HTTP). * The execute bit was changed
* The hook is either server specific or part of general infrastructure rather
than client specific code (such as commit). * ``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 * ``host``: can be empty (to act as a default for any host), * ``password``: can be empty if you prefer to always be prompted for your
password. * ``path``: can be empty (FTP or SFTP will never user it), * ``port`` can be empty (useful when an host provides several servers for the
same scheme), only numerical values are allowed, this should be used only
when the server uses a port different than the scheme standard port, * ``scheme``: can be empty (meaning the rest of the definition can be used
for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, ``ssh``
should be used instead since this is the real scheme regarding
authentication, * ``user``: can be empty (``bzr`` will defaults to python's
``getpass.get_user()``), * revision 1: add tutorial.txt
* revision 2: modify tutorial.txt
* revision 3: rename tutorial.txt to guide.txt; add tutorial.txt * {date} - date of the last revision
* {build_date} - current date
* {revno} - revision number
* {revision_id} - revision id
* {branch_nick} - branch nickname
* {clean} - 0 if the source tree contains uncommitted changes,
otherwise 1 + File versioned
- File unversioned
R File renamed
? File unknown
X File nonexistent (and unknown to bzr)
C File has conflicts
P Entry for a pending merge (not a file) - delegate password storage to plugins (.netrc for example). - storing the passwords in various obfuscating encodings (base64 for one), :bound The branch this branch is bound to, for bound branches.
:parent The parent of this branch.
:public The public location of this branch.
:push The saved location used for `bzr push` with no arguments.
:submit The submit branch for this branch.
:this This branch. <<<<<<< TREE
Martin Pool released it.
=======
The project leader released Bazaar.
>>>>>>> MERGE-SOURCE <protocol>://[user[:password]@]host[:port]/[path] ================= =========================
Supported formats Autodetected by extension
================= =========================
dir (none)
tar .tar
tbz2 .tar.bz2, .tbz2
tgz .tar.gz, .tgz
zip .zip
================= ========================= ============================ ============ ============
URL Abbreviation Example
============================ ============ ============
https://bugs.launchpad.net/ lp lp:12345
http://bugs.debian.org/ deb deb:12345
http://bugzilla.gnome.org/ gnome gnome:12345
============================ ============ ============ ? - Matches any single character except '/'
* - Matches 0 or more characters except '/'
/**/ - Matches 0 or more directories in a path
[a-z] - Matches a single character from within a group of characters 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. BZR_DISABLE_PLUGINS='myplugin:yourplugin' BZR_PLUGIN_PATH='-site:+user' BZR_PLUGIN_PATH='-user:-core:-site' BZR_PLUGIN_PATH='/path/to/my/other/plugins' BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user Conflict adding file FILE. Moved existing file to FILE.moved. Conflict adding files to FILE. Created directory. Conflict moving FILE into DIRECTORY. Cancelled move. Conflict: can't delete DIR because it is not empty. Not deleting. Conflict: foo.new is not a directory, but has files in it.
Created directory. Conflicting tags:
version-0.1 Contents conflict in FILE 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: Feature long short line
---------------------- ------------- ------------ -------------------
design goal detailed view concise view 1 revision per line
committer name+email name only name only
author name+email - -
date-time format full date only date only
commit message full full top line
tags yes yes yes
merges indicator - yes -
status/delta optional optional -
diff/patch optional optional -
revision-id optional optional -
branch nick yes - -
foreign vcs properties yes yes -
preferred levels all 1 1
digital signature optional - - 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: N File created
D File deleted
K File kind changed
M File modified 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). Path conflict: PATH1 / PATH2 RE:(?i)foo Remove the branch at repo/trunk:: 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:: Set the Launchpad ID of the current user to 'bob':: 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. Text conflict in FILE 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 define a named view and switch to it:: To delete a named view:: To delete all views:: To delete the current view:: To disable the current view without deleting it:: 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. To list a named view:: To list all views defined:: To list the current view:: To switch to a named view:: 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``:: [/home/vila/src/bzr/bugs]
mypush = lp:~vila/bzr
mypush:policy=appendpath [/home/vila/src/bzr/bugs]
mypush = lp:~vila/bzr/{branchname} [/home/vila/src/bzr/bugs]
mypush = lp:~vila/bzr/{relpath} [/home/vila/src/bzr]
mypush = lp:~vila/bzr/{basename} [/top/location]
push_location = sftp://example.com/location
push_location:policy = appendpath [ALIASES]
commit = commit --strict
log10 = log --short -r -10..-1
[DEFAULT]
email=John Doe <jdoe@isp.com> [DEFAULT]
log_format = short [myprojects]
scheme=ftp
host=host.com
user=joe
password=secret
[name *.bat]
eol = crlf [name *.png]
eol = exact [name *.sh]
eol = lf [name *]
eol = native [name *]
eol = native-with-crlf-in-repo [name test_data/]
eol = exact ``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 resolve FILE --action=done' ``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``. aftp:// Access using active FTP.
bzr:// Fast access using the Bazaar smart server.
bzr+ssh:// Fast access using the Bazaar smart server over SSH.
file:// Access using the standard filesystem (default)
ftp:// Access using passive FTP.
http:// Read-only access of branches exported on the web.
https:// Read-only access of branches exported on the web using SSL.
sftp:// Access using SFTP (most SSH servers provide SFTP). bzr add make files or directories versioned
bzr ignore ignore a file or pattern
bzr mv move or rename a versioned file bzr branch ftp://host.com/path/to/my/branch bzr branch ftp://joe:secret@host.com/path/to/my/branch bzr config mypush
lp:~vila/bzr/832013-expand-in-stack 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 help init more help on e.g. init command
bzr help commands list all commands
bzr help topics list all help topics
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 log show history of changes
bzr check validate storage bzr log file:///tmp/%2False (refers to a file called /tmp/\/alse)
bzr log %252False (refers to a file called /tmp/%252False) bzr log foo,branch=bla # path "foo" with the segment parameter "branch" set to "bla"
bzr log file:foo%2Cbranch=bla # path "foo,branch=bla"
bzr log file:foo,branch=bla # path "foo" with segment parameter "branch" set to "bla"
bzr lp-find-proposal -r annotate:README:1 bzr lp-propose-merge --review jrandom --review review-team=qa bzr merge pull in changes from another branch
bzr commit save some or all changes
bzr send send changes via email bzr status summarize changes in working copy
bzr diff show detailed diffs bzr version-info --custom \
--template="#define VERSION_INFO \"Project 1.2.3 (r{revno})\"\n" bzr+ssh://remote@shell.example.com/~/myproject/trunk bzr.default_mergetool = kdiff3
bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result} cd /tmp
bzr log /tmp/%2False
bzr log %2False
bzr log file:///tmp/%252False
bzr log file://localhost/tmp/%252False
bzr log file:%252False checkout Create a working tree when a branch does not have one.
remove-tree Removes the working tree from a branch when it is safe to do so.
update When a working tree is out of sync with its associated branch
this will update the tree to match the branch.
checkout Create a checkout. Pass --lightweight to get a lightweight
checkout
update Pull any changes in the master branch in to your checkout
commit Make a commit that is sent to the master branch. If you have
a heavy checkout then the --local option will commit to the
checkout without sending the commit to the master
switch Change the master branch that the commits in the checkout will
be sent to
bind Turn a standalone branch into a heavy checkout so that any
commits will be sent to the master branch
unbind Turn a heavy checkout into a standalone branch so that any
commits are only made locally
info Displays whether a branch is bound or unbound. If the branch is
bound, then it will also display the location of the bound branch
gio+ Access using any GIO supported protocols. http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk http_proxy=http://proxy.example.com:3128/
https_proxy=http://proxy.example.com:3128/ init Change a directory into a versioned branch.
branch Create a new branch that is a copy of an existing branch.
merge Perform a three-way merge.
bind Bind a branch to another one.
init Make a directory into a versioned branch.
init-repository Create a shared repository. Use --no-trees to create one
in which new branches won't get a working tree.
yyy.hooks.install_named_hook("xxx", ...) {base} file.BASE
{this} file.THIS
{other} file.OTHER
{result} output file
{this_temp} temp copy of file.THIS, used to overwrite output file if merge
succeeds. * File system paths, relative or absolute * Fully qualified URLs * To reapply read converters, ``touch`` files, i.e. update their
timestamp. Operations like ``bzr status`` should then reapply the
relevant read converters and compare the end result with the
canonical format. * To reapply write converters, ensure there are no local changes,
delete the relevant files and run ``bzr revert`` on those files. 1. the first match wins, 2. empty fields match everything, 3. ``scheme`` matches even if decorators are used in the requested URL, 4. ``host`` matches exactly or act as a domain if it starts with '.'
(``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf.net``
will not match ``bzr.sf.net``). 5. ``port`` matches if included in the requested URL (exact matches only) 6. ``path`` matches if included in the requested URL (and by rule #2 above,
empty paths will match any provided path). ========== ===================================== ======================
Value Checkout end-of-lines as Commit end-of-lines as
========== ===================================== ======================
``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``
---------- ------------------------------------- ----------------------
``lf`` ``lf`` ``lf``
---------- ------------------------------------- ----------------------
``crlf`` ``crlf`` ``lf``
---------- ------------------------------------- ----------------------
``exact`` No conversion Exactly as in file
========== ===================================== ====================== ============================ ======================== ======================
Value Checkout end-of-lines as Commit end-of-lines as
============================ ======================== ======================
``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``
``lf`` otherwise
---------------------------- ------------------------ ----------------------
``lf-with-crlf-in-repo`` ``lf`` ``crlf``
---------------------------- ------------------------ ----------------------
``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``
============================ ======================== ====================== none:
the value is interpreted the same for contained locations. This is
the default behaviour.
norecurse:
the value is only used for the exact location specified by the
section name.
appendpath:
for contained locations, any additional path components are
appended to the value. "%(alias_name)s" is not a valid location alias. "%(function)s" called on an AtomicFile after it was closed: "%(path)s" "%(invalid_id)s" is not a valid shelf id, try a number instead. "%(path)s" is not a directory %(extra)s "%(path)s" is not in the working directory %(extra)s "%s" is not a valid <plugin_name>@<plugin_path> description "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
produces patches suitable for "patch -p1". %(bzrdir)r does not support co-located branches. %(context_info)s%(path)s is already versioned. %(context_info)s%(path)s is not versioned. %(exe_name)s could not be found on this machine %(msg)s %(host)s%(port)s%(orig_error)s %(not_locked)r is not write locked but needs to be. %(source)s is%(permanently)s redirected to %(target)s %(target)s
is not compatible with
%(source)s
%(details)s %(url)s is not a local path. %(username)r does not seem to contain a reasonable email address %(value)s is not an index of type %(_type)s. %6d file-ids %6d ghost revisions %6d inconsistent parents %6d revisions %6d revisions and inventories %6d revisions are mentioned but not present %6d revisions are missing inventory_sha1 %6d revisions have incorrect parents in the revision index %6d revisions missing parents in ancestry %6d revisions not present %6d texts %6d unreferenced text versions %d conflict auto-resolved. %d conflicts auto-resolved. %d conflicts encountered. %d proposals(s) found. %d tag updated. %d tags updated. %r is too short to calculate a relative path %s
Commit refused. %s - Stage %s cannot canonicalize CHKs. %s has no associated product or source package. %s has no development focus. %s is already up-to-date. %s is not registered on Launchpad %s is now not stacked
'%(display_url)s' is already a branch. '%(display_url)s' is already a checkout. '%(display_url)s' is already a lightweight checkout. '%(display_url)s' is already a tree. '%(display_url)s' is already standalone. '%(display_url)s' is already using a shared repository. '%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-reconfigure. '{0}' view is: {1}
(Default: "bzr"). The path to the command that should be used to run the smart
server for bzr. This value may only be specified in locations.conf, because: (Default: "gpg"). Which program should be used to sign and check revisions.
For example:: (Default: "localhost"). SMTP server to use when Bazaar needs to send
email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin. (The --force option is deprecated, rather use --no-backup in future.) (default) * 0 = Standard SIGQUIT behavior (normally, exit with a core dump)
* 1 = Invoke breakin debugger (default) * 0 = Standard behavior
* 1 = Launch debugger * A machine-readable description of the merge to perform * An optional bundle of revision data, so that the changes can be applied
directly from the merge directive, without retrieving data from a
branch. * An optional patch that is a preview of the changes requested * Ignore patterns starting with "#" act as comments in the ignore file.
To ignore patterns that begin with that character, use the "RE:" prefix. * ``+user``, ``+core``, ``+site`` will add the corresponding path
before the remaining default values (and also remove it from
the default values). * ``--action=done`` will just mark the conflict as resolved. * ``--action=take-other`` will issue ``bzr rm directory`` including the
children, * ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white``
in ``black``,
* ``--action=take-other`` will revert Bazaar choice and move ``black`` in
``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,
* ``--action=done`` will just mark the conflict as resolved. * ``--action=take-this`` will acknowledge Bazaar choice to keep the directory, * ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,
* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,
* ``--action=done`` will just mark the conflict as resolved. * ``--action=take-this`` will issue ``bzr rm --force foo.new`` and
``bzr add foo``,
* ``--action=take-other`` will issue ``bzr rm --force foo`` and
``bzr mv foo.new foo``,
* ``--action=done`` will just mark the conflict as resolved. * ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved FILE``,
* ``--action=take-other`` will issue ``bzr rm FILE.moved``,
* ``--action=done`` will just mark the conflict as resolved. * ``--action=take-this`` will issue ``bzr rm directory`` including the
children,
* ``--action=take-other`` will acknowledge Bazaar choice to keep the children
and restoring the directory,
* ``--action=done`` will just mark the conflict as resolved. * ``--action=take-this`` will issue ``mv FILE.THIS FILE``,
* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``. * ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by
issuing ``bzr mv PATH2 PATH1``,
* ``--action=take-other`` will acknowledge Bazaar choice of keeping ``PATH2``,
* ``--action=done`` will just mark the conflict as resolved. * ``-user``, ``-core``, ``-site`` will remove the corresponding
path from the default values, * ``authentication.conf`` describes credential information for
remote servers. * ``bazaar.conf`` describes default configuration options, * ``conflict`` (the default): will leave the orphans in place and
generate a conflicts, * ``format_deprecation``:
whether the format deprecation warning is shown on repositories that are
using deprecated formats. * ``host``: the remote server, * ``locations.conf`` describes configuration information for
specific branch locations, * ``move``: will move the orphans to a ``bzr-orphans`` directory at the root
of the working tree with names like ``<file>.~#~``. * ``password``: the password. * ``path``: the branch location, * ``port``: the port the server is listening, * ``user``: the login to be used, * a canonical format - how files are stored internally
* a convenience format - how files are created in a working tree. * a read converter - converts from convenience to canonical format
* a write converter - converts from canonical to convenience format. * add a ``password_encoding`` field allowing: * add a ``verify_certificates`` field for ``HTTPS``. * the bzrlib directory (containing the ``core`` plugins), * the site specific plugin directory if applicable (containing
the ``site`` plugins). * the user specific plugin directory (containing the ``user`` plugins), * update the credentials when the user is prompted for user or password, *** Ignoring files outside view. View is %s *** {0} content-filter: {1} => {2!r} , the header appears corrupt, try passing -r -1 to set the state to the last commit - it's needed before branch.conf is accessible
- allowing remote branch.conf files to specify commands would be a security
risk - not supported for merge directives that use more than one output file. --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 --exclude-common-ancestry requires two different 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/") --product is deprecated; please use --project. --profile Profile execution using the hotshot profiler.
--lsprof Profile execution using the lsprof profiler.
--lsprof-file Profile execution using the lsprof profiler, and write the
results to a specified file. If the filename ends with ".txt",
text format will be used. If the filename either starts with
"callgrind.out" or end with ".callgrind", the output will be
formatted for use with KCacheGrind. Otherwise, the output
will be a pickle.
--coverage Generate line coverage report in the specified directory. --remember requires a branch to be specified. --tree and --revision can not be used together --uncommitted requires a working tree --verbose requires a merge directive --verbose shows the path where each plugin is located. --verbose will print out what is being removed.
--dry-run will go through all the motions, but not actually
remove anything. --version Print the version number. Must be supplied before the command.
--no-aliases Do not process command aliases when running this command.
--builtin Use the built-in version of a command, not the plugin version.
This does not suppress other plugin effects.
--no-plugins Do not process any plugins.
--no-l10n Do not translate messages.
--concurrency Number of processes that can be run concurrently (selftest). -Dauth Trace authentication sections used.
-Dbytes Print out how many bytes were transferred
-Ddirstate Trace dirstate activity (verbose!)
-Derror Instead of normal error handling, always print a traceback
on error.
-Devil Capture call sites that do expensive or badly-scaling
operations.
-Dfetch Trace history copying between repositories.
-Dfilters Emit information for debugging content filtering.
-Dforceinvdeltas Force use of inventory deltas during generic streaming fetch.
-Dgraph Trace graph traversal.
-Dhashcache Log every time a working file is read to determine its hash.
-Dhooks Trace hook execution.
-Dhpss Trace smart protocol requests and responses.
-Dhpssdetail More hpss details.
-Dhpssvfs Traceback on vfs access to Remote objects.
-Dhttp Trace http connections, requests and responses.
-Dindex Trace major index operations.
-Dknit Trace knit operations.
-Dlock Trace when lockdir locks are taken or released.
-Dnoretry If a connection is reset, fail immediately rather than
retrying the request.
-Dprogress Trace progress bar operations.
-Dmem_dump Dump memory to a file upon an out of memory error.
-Dmerge Emit information for debugging merges.
-Dno_apport Don't use apport to report crashes.
-Dno_activity Don't show transport activity indicator in progress bar.
-Dpack Emit information about pack operations.
-Drelock Emit a message every time a branch or repository object is
unlocked then relocked the same way.
-Dsftp Trace SFTP internals.
-Dstatic_tuple Error when a tuple is used where a StaticTuple is expected
-Dstream Trace fetch streams.
-Dstrict_locks Trace when OS locks are potentially used in a non-portable
manner.
-Dunlock Some errors during unlock are treated as warnings.
-DIDS_never Never use InterDifferingSerializer when fetching.
-DIDS_always Always use InterDifferingSerializer to fetch if appropriate
for the format, even for non-local fetches.
-Oname=value Override the ``name`` config option setting it to ``value`` for
the duration of the command. This can be used multiple times if
several options need to be overridden. .. _Python regular expressions: http://docs.python.org/library/re.html .. note:: 1. Modify the working tree content so that the conflicted item is now in the
state you want to keep, then 1. user and password 2. Inform Bazaar that the conflict is now solved and ask to cleanup any
remaining generated information (``bzr resolve <item>``). 2. user, realm and password :2a:
(native) (default) Format for the bzr 2.0 series. Uses group-
compress storage. Provides rich roots which are a one-way
transition. :Aliases: :Checks: :Custom authors: :Description:
%s
: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:: :Examples:
bzr break-lock
bzr break-lock bzr+ssh://example.com/bzr/foo
bzr break-lock --conf ~/.bazaar :Examples:
Show the Launchpad ID of the current user:: :Examples:
To define the current view:: :Exit values:
1 - changed
2 - unrepresentable changes
3 - error
0 - no change :From: plugin "%s"
:Notes:
* Ignore patterns containing shell wildcards must be quoted from
the shell on Unix. :On Unix: ~/.bazaar/bazaar.conf
:On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf :Options:%s :Ordering control: :Other filtering: :Output control: :Path filtering: :Purpose: %s
:Revision filtering: :See also: %s :Selective commits: :Things to note: :Tips & tricks: :Usage:
%s
:Usage: %s
:ancestor: :annotate: :before: :branch: :claws: Use Claws. This skips a dialog for attaching files.
:evolution: Use Evolution.
:kmail: Use KMail.
:mutt: Use Mutt.
:thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove 1.5,
this works around some bugs that xdg-email doesn't handle. :date: :default: See above.
:editor: Use your editor to compose the merge request. This also uses
your commit id, (see ``bzr whoami``), smtp_server and (optionally)
smtp_username and smtp_password.
:mapi: Use your preferred e-mail client on Windows.
:xdg-email: Use xdg-email to run your preferred mail program :development-colo:
(native) The 2a format with experimental support for colocated
branches. :doc:`{0} <{1}-help>` :last: :mainline: :pack-0.92:
(native) 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. :revid: :revid:
Selects a revision using the revision id.
:submit:
Selects a common ancestor with the submit branch.
:ancestor:
Selects a common ancestor with a second branch.
:date:
Selects a revision on the basis of a datestamp.
:branch:
Selects the last revision of a specified branch.
:tag:
Selects a revision identified by a tag name.
:revno:
Selects a revision using a number.
:before:
Selects the parent of the revision specified.
:annotate:
Select the revision that last modified the specified line.
:mainline:
Select mainline revision that merged the specified revision.
:last:
Selects the nth revision from the end. :revno: :submit: :tag: =================== ===========================================================
BZRPATH Path where bzr is to look for shell plugin external
commands.
BZR_EMAIL E-Mail address of the user. Overrides EMAIL.
EMAIL E-Mail address of the user.
BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.
EDITOR Editor for editing commit messages.
BZR_PLUGIN_PATH Paths where bzr should look for plugins.
BZR_DISABLE_PLUGINS Plugins that bzr should not load.
BZR_PLUGINS_AT Plugins to load from a directory not in BZR_PLUGIN_PATH.
BZR_HOME Directory holding .bazaar config dir. Overrides HOME.
BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA and
HOME.
BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// URLs).
BZR_SSH Path to SSH client, or one of paramiko, openssh, sshcorp,
plink or lsh.
BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).
BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).
BZR_COLUMNS Override implicit terminal width.
BZR_CONCURRENCY Number of processes that can be run concurrently (selftest)
BZR_PROGRESS_BAR Override the progress display. Values are 'none' or 'text'.
BZR_PDB Control whether to launch a debugger on error.
BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a
breakin debugger.
BZR_TEXTUI_INPUT Force console input mode for prompts to line-based (instead
of char-based).
=================== ===========================================================
A Python unicode encoding name for text output from bzr, such as log
information. Values include: utf8, cp850, ascii, iso-8859-1. The default
is the terminal encoding prefered by the operating system. A Solution
---------- 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 branch consists of the state of a project, including all of its
history. All branches have a repository associated (which is where the
branch history is stored), but multiple branches may share the same
repository (a shared repository). Branches can be copied and merged. A checkout is created with the bzr checkout command (see "help checkout").
You pass it a reference to another branch, and it will create a local copy
for you that still contains a reference to the branch you created the
checkout from (the master branch). Then if you make any commits they will be
made on the other branch first. This creates an instant mirror of your work, or
facilitates lockstep development, where each developer is working together,
continuously integrating the changes of others. A comma-separated list of debugging options to turn on. The same values
can be used as with the -D command-line option (see `help global-options`).
For example:: A comment is any line that starts with a "#" (sometimes called a "hash
mark", "pound sign" or "number sign"). Comment lines are ignored by
Bazaar when parsing ini files. A control directory already exists: "%(path)s". A criss-cross in the branch history can cause the default merge technique
to emit more conflicts than would normally be expected. A detailed description of each keyword is given below. A directory cannot be a bundle A format name for the default format used when creating branches. See ``bzr
help formats`` for possible values. A hook of type *xxx* of class *yyy* needs to be registered using:: A list of strings, each string represent a warning that can be emitted by
bzr. Mentioning a warning in this list tells bzr to not emit it. A log format controls how information about each revision is displayed.
The standard log formats are compared below:: A mail client to use for sending merge requests.
By default, bzr will try to use ``mapi`` on Windows. On other platforms, it
will try ``xdg-email``. If either of these fails, it will fall back to
``editor``. A merge directive must provide either a bundle or a public branch location. A merge directive provides many things needed for requesting merges: A number of debug flags are also available to assist troubleshooting and
development. See :doc:`debug-flags-help`.
A option can reference other options by enclosing them in curly brackets:: A plugin is an external component for Bazaar that extends the
revision control system, by adding or replacing code in Bazaar.
Plugins can do a variety of things, including overriding commands,
adding new commands, providing additional network transports and
customizing log output. A publically-accessible version of this branch (implying that this version is
not publically-accessible). Used (and set) by ``bzr send``. A revision identifier refers to a specific state of a branch's history. It
can be expressed in several ways. It can begin with a keyword to
unambiguously specify a given lookup type; some examples are 'last:1',
'before:yesterday' and 'submit:'. A section header is a word enclosed in brackets that starts at the begining
of a line. A typical section header looks like this:: A section option resides within a section. A section option contains an
option name, an equals sign and a value. For example:: A standalone tree is a working tree with an associated repository. It
is an independently usable branch, with no dependencies on any other.
Creating a standalone tree (via bzr init) is the quickest way to put
an existing project under version control. A target configuration must be specified. A transaction related operation was attempted after the transaction finished. A typical ``bazaar.conf`` section often looks like the following:: A typical config file might look something like:: A warning will be printed when nested trees are encountered,
unless they are explicitly ignored. A working tree is the contents of a branch placed on disk so that you can
see the files and edit them. The working tree is where you make changes to a
branch, and when you commit the current state of the working tree is the
snapshot that is recorded in the commit. Add file "%(path)s"? 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. Adding file contents 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. After unbinding, the local branch is considered independent and subsequent
commits will be local only. Aliases for remembered locations All changes applied successfully. All commits signed with verifiable keys All conflicts resolved. All connections are done with the same ``user`` (the remote one for which the
default bzr one is not appropriate) and the password is always prompted with
some exceptions:: All hidden commands Already a branch: "%(path)s". Alternately, it can be given without a keyword, in which case it will be
checked as a revision number, a tag, a revision id, a date specification, or a
branch specification, in that order. For example, 'date:today' could be
written as simply 'today', though if you have a tag called 'today' that will
be found first. Alternatively, to change the log format used for a given query, use the
--long, --short or --line options. Alternatively, to list just the files:: An attempt to access a url outside the server jail was made: '%(url)s'. An error has been detected in the repository %(repo_path)s.
Please run bzr reconcile on this repository. 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. An inconsistent delta was supplied involving %(path)r, %(file_id)r
reason: %(reason)s An inconsistent delta was supplied: %(delta)r
reason: %(reason)s An ini file has three types of contructs: section headers, section
options and comments. Another class is 'detritus', which includes files emitted by bzr during
normal operations and selftests. (The value of these files decreases with
time.) Another possible use for a checkout is to use it with a treeless repository
containing your branches, where you maintain only one working tree by
switching the master branch that the checkout points to when you want to
work on a different branch. Another such option is ``basename`` which can be used like this:: Another such option is ``branchname``, which refers to the name of a colocated
branch. For non-colocated branches, it behaves like basename. It can be used
like this:: Any action will also delete the previously generated ``.BASE``, ``.THIS`` and
``.OTHER`` files if they are still present in the working tree. Any files matching patterns in the ignore list will not be added
unless they are explicitly mentioned. Any revision involved in the merge may be specified-- the revision in
which the merge was performed, or one of the revisions that was merged. Apply %d change(s)? Apply binary changes? Apply change? Apply changes and remove from the shelf. Apply changes but don't delete them. Apply content filters to display the convenience form. Apply content filters to export the convenient form. Apply list or delete action to all views. Apply phase Apply uncommitted changes from a working copy, instead of branch changes. Are you sure you wish to delete these As for the ``PATH`` variables, if multiple directories are
specified in ``BZR_PLUGIN_PATH`` they should be separated by the
platform specific appropriate character (':' on Unix,
';' on windows) Ask Launchpad to mirror a branch now. At %s you have a valid .bzr control directory, but not a branch or repository. This is an unsupported configuration. Please move the target directory out of the way and try again. At company.com, the server hosting release and integration branches is behind a
proxy, and the two branches use different authentication policies:: At the same time it is run it may recompress data resulting in
a potential saving in disk space or performance gain. Attempt to reuse a transform that has already been applied. Authenticated as %s Authentication Settings
======================= Authentication definitions
-------------------------- Authors Automatically guess renames. Avoid making changes when guessing renames. BZRPATH
~~~~~~~ BZR_DISABLE_PLUGINS
~~~~~~~~~~~~~~~~~~~ BZR_EDITOR
~~~~~~~~~~ BZR_EMAIL
~~~~~~~~~ BZR_HOME
~~~~~~~~ BZR_LOG
~~~~~~~ BZR_PDB
~~~~~~~ BZR_PLUGINS_AT
~~~~~~~~~~~~~~ BZR_PROGRESS_BAR
~~~~~~~~~~~~~~~~ BZR_REMOTE_PATH
~~~~~~~~~~~~~~~ BZR_SIGQUIT_PDB
~~~~~~~~~~~~~~~ BZR_SSH
~~~~~~~ Backing up inventory Backup Inventory created Backup changed files (default). Backup inventory created. Bad bzr revision-bundle: %(text)r Bad merge directive payload %(start)r Bad value "%(value)s" for option "%(name)s". Bad value "%(value)s" for option "%(name)s".
See ``bzr help %(name)s`` Basic commands Basic commands:
bzr init makes this directory a versioned branch
bzr branch make a copy of another branch Basic help for all commands Basic information on shared repositories. Bazaar 2.6b2 -- a free distributed version-control tool
http://bazaar.canonical.com/ Bazaar allows locations to be specified in multiple ways, either: 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. Bazaar cannot auto-detect when conflicts of this kind have been resolved. Bazaar defines several aliases for locations associated with a branch. These
can be used with most commands that expect a location, such as `bzr push`. Bazaar knows about a few bug trackers that have many users. If
you use one of these bug trackers then there is no setup required to
use this feature, you just need to know the tracker identifier to use.
These are the bugtrackers that are built in: Bazaar supports all of the standard parts within the URL:: Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the
conflict if and only if there's an actual conceptual conflict in the source
tree. Because Bazaar doesn't understand the real meaning of the files being
versioned, it can, when faced with ambiguities, fall short in either direction
trying to resolve the conflict itself. Many kinds of changes can be combined
programmatically, but sometimes only a human can determine the right thing to
do. Bazaar uses patterns to match files at various times. For example,
the ``add`` command skips over files that match ignore patterns
and preferences can be associated with files using rule patterns.
The pattern syntax is described below. Bazaar's content filtering allows you to store files in a different
format from the copy in your working tree. This lets you, or your
co-developers, use Windows development tools that expect CRLF files
on projects that use other line-ending conventions. Among other things,
content filters also let Unix developers more easily work on projects
using Windows line-ending conventions, keyword expansion/compression,
and trailing spaces on lines in text files to be implicitly stripped
when committed. 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. Before using this command you must register the project to which the
branch belongs, and create an account for yourself on launchpad.net. Binary files section encountered. Bind new branch to from location. Body for the email. Both --delete and --switch specified Both --delete and a file list specified Both --switch and --all specified Both --switch and a file list specified Both the submit branch and the public branch follow the usual behavior with
respect to --remember: If there is no default location set, the first send
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 location can be accessed. Bound branch %(branch)s is out of date with master branch %(master)s.%(extra_help)s Bound branches use the nickname of its master branch unless it is set
locally, in which case binding will update the local nickname to be
that of the master. Bound branches use the nickname of its master branch unless it is set
locally, in which case switching will update the local nickname to be
that of the master. Bound branches use the nickname of its master branch unless it is set
locally. Branch "%(branch_url)s" appears to be bound to itself. Please use `bzr unbind` to fix. Branch %(base)s is missing revision %(text_revision)s of %(file_id)s Branch %(branch)s has no commits. Branch author's email address, if not yourself. Branch format Branch in which to place the tag. Branch is active. Use --force to remove it. Branch is already bound Branch to bind checkout to. Branch to generate the submission from, rather than the one containing the working directory. Branch to merge into, rather than the one containing the working directory. Branch to operate on, instead of 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 whose tags should be displayed. Branch/tree to compare from. Branch/tree to compare to. Branched %d revision. Branched %d revisions. Branches Branches Out of Sync Branches and working trees will also report any missing revisions. Branches are up to date.
Branches have no common ancestor, and no merge base revision was specified. Branches in the repository will default to not having a working tree. Branching '%(url)s'(%(format)s) must create a working tree. Break a dead lock. Bug Tracker Settings Bug tracker settings Building tree Bundle format %(bundle_format)s is incompatible with %(other)s Bundle format not supported Bundling %d revision. Bundling %d revisions. 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 if ``BZR_PLUGIN_PATH`` is set, it replaces searching
in ``user``. However it will continue to search in ``core`` and
``site`` unless they are explicitly removed. By default just running 'bzr init' will create a repository within the new
branch but it is possible to create a shared repository which allows multiple
branches to share their information in the same location. When a new branch is
created it will first look to see if there is a containing shared repository it
can use. 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 merge directive is self-contained and can be applied to any
branch containing submit_branch in its ancestory without needing access to
the source branch. By default the server is a readonly server. Supplying --allow-writes enables write access to the contents of the served directory and below. Note that ``bzr serve`` does not perform authentication, so unless some form of external authentication is arranged supplying this option leads to global uncontrolled write access to your file system. By default, only unknown files, not ignored files, are deleted. Versioned
files are never deleted. By default, the SUBMIT_BRANCH's review team will be requested to review
the merge proposal. This can be overriden by specifying --review (-R).
The parameter the launchpad account name of the desired reviewer. This
may optionally be followed by '=' and the review type. For example: 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, the most recently shelved changes are restored. However if you
specify a shelf by id those changes will be restored instead. This works
best when the changes don't depend on each other. 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. CAUTION: Locks should only be broken when you are sure that the process
holding the lock has been stopped. Calculating hashes Calculating text parents Called after a checkout switches branch. post_switch is called with a
bzrlib.branch.SwitchHookParams. Called after a commit is calculated but before it is completed.
pre_commit is called with (local, master, old_revno, old_revid,
future_revno, future_revid, tree_delta, future_tree). old_revid is
NULL_REVISION for the first commit to a branch, tree_delta is a
TreeDelta object describing changes from the basis revision. hooks
MUST NOT modify this delta. future_tree is an in-memory tree obtained
from CommitBuilder.revision_tree() and hooks MUST NOT modify this
tree. Called after a commit is performed on a tree. The hook is called with
a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the
commit was performed on is available via the mutable_tree attribute of
that object. Called after a completely new tree is built. The hook is called with
the tree as its only argument. Called after a merge. Receives a Merger object as the single argument.
The return value is ignored. Called after a new connection is established or a reconnect occurs.
The sole argument passed is either the connected transport or smart
medium instance. Called after a pull operation completes. post_pull is called with a
bzrlib.branch.PullResult object and only runs in the bzr client. Called after a push operation completes. post_push is called with a
bzrlib.branch.BranchPushResult object and only runs in the bzr client. Called after a tree transform has been performed on a tree. The hook
is called with the tree that is being transformed and the transform. Called after creating a command object to allow modifications such as
adding or removing options, docs etc. Called with the new
bzrlib.commands.Command object. Called after executing a command. Called with the command object. Called after new branch initialization completes. post_branch_init is
called with a bzrlib.branch.BranchInitHookParams. Note that init,
branch and checkout (both heavyweight and lightweight) will all
trigger this hook. Called before a commit is performed on a tree. The start commit hook
is able to change the tree before the commit takes place. start_commit
is called with the bzrlib.mutabletree.MutableTree that the commit is
being performed on. Called before a merge. Receives a Merger object as the single
argument. Called before a tree transform on this tree. The hook is called with
the tree that is being transformed and the transform. Called by the bzr server when an exception occurs. server_exception is
called with the sys.exc_info() tuple return true for the hook if the
exception has been handled, in which case the server will exit
normally. Called by the bzr server when it starts serving a directory.
server_started is called with (backing urls, public url), where
backing_url is a list of URLs giving the server-specific directory
locations, and public_url is the public URL for the directory being
served. Called by the bzr server when it starts serving a directory.
server_started is called with (backing_urls, server_obj). Called by the bzr server when it stops serving a directory.
server_stopped is called with the same parameters as the
server_started hook: (backing_urls, public_url). Called in bzr client and server after a change to the tip of a branch
is made. post_change_branch_tip is called with a
bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,
uncommit will all trigger this hook. Called in bzr client and server before a change to the tip of a branch
is made. pre_change_branch_tip is called with a
bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,
uncommit will all trigger this hook. Called in the bzr client after a commit has completed. post_commit is
called with (local, master, old_revno, old_revid, new_revno,
new_revid). old_revid is NULL_REVISION for the first commit to a
branch. Called in the bzr client after an uncommit completes. post_uncommit is
called with (local, master, old_revno, old_revid, new_revno,
new_revid) where local is the local branch or None, master is the
target branch, and an empty branch receives new_revno of 0, new_revid
of None. Called prior to executing a command. Called with the command object. Called to determine an automatic tag name for a revision.
automatic_tag_name is called with (branch, revision_id) and should
return a tag name or None if no tag name could be determined. The
first non-None tag name returned will be used. Called when a commit message is being generated.
commit_message_template is called with the bzrlib.commit.Commit object
and the message that is known so far. commit_message_template must
return a new message to use (which could be the same as it was given).
When there are multiple hooks registered for commit_message_template,
they are chained with the result from the first passed into the
second, and so on. Called when a stacked branch is activating its fallback locations.
transform_fallback_location is called with (branch, url), and should
return a new url. Returning the same url allows it to be used as-is,
returning a different one can be used to cause the branch to stack on
a closer copy of that fallback_location. Note that the branch cannot
have history accessing methods called on it during this hook because
the fallback locations have not been activated. When there are
multiple hooks installed for transform_fallback_location, all are
called with the url returned from the previous hook.The order is
however undefined. Called when creating a single command if no command could be found.
Called with (command_name). get_missing_command should either return
None, or a Command object to be used for the command. Called when creating a single command. Called with (cmd_or_None,
command_name). get_command should either return the cmd_or_None
parameter, or a replacement Command object that should be used for the
command. Note that the Command.hooks hooks are core infrastructure.
Many users will prefer to use bzrlib.commands.register_command or
plugin_cmds.register_lazy. Called when enumerating commands. Called with a set of cmd_name
strings for all the commands found so far. This set is safe to mutate
- e.g. to remove a command. list_commands should return the updated
set of command names. Called when the smart client is submitting a request to the smart
server. Called with a bzrlib.smart.client.CallHookParams object.
Streaming request bodies, and responses, are not accessible. Called with a MergeRequestBodyParams when a body is needed for a merge
request. Callbacks must return a body. If more than one callback is
registered, the output of one callback is provided to the next. Called with a bzrlib.lock.LockResult when a physical lock is acquired. Called with a bzrlib.lock.LockResult when a physical lock is broken. Called with a bzrlib.lock.LockResult when a physical lock is released. Called with a bzrlib.merge.Merger object to create a per file merge
object when starting a merge. Should return either None or a subclass
of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be
called per file that needs to be merged (including when one side has
deleted the file and the other has changed it). See the
AbstractPerFileMerger API docs for details on how it is used by merge. Called with argument StatusHookParams after Bazaar has displayed the
status. StatusHookParams has the attributes (old_tree, new_tree,
to_file, versioned, show_ids, short, verbose). The last four arguments
correspond to the command line options specified by the user for the
status command. to_file is the output stream for writing. Called with argument StatusHookParams before Bazaar displays the
status. StatusHookParams has the attributes (old_tree, new_tree,
to_file, versioned, show_ids, short, verbose). The last four arguments
correspond to the command line options specified by the user for the
status command. to_file is the output stream for writing. Called with the Branch object that has been opened after a branch is
opened. Can't join trees because %s doesn't support rich root data.
You can use bzr upgrade on the repository. Can't reprocess and show base, because reprocessing obscures the relationship of conflicting lines to the base Can't subsume %(other_tree)s into %(tree)s. %(reason)s Can't use both --stacked-on and --unstacked Canceled Canceled
Cannot bind address "%(host)s:%(port)i": %(orig_error)s. Cannot change the 'off' pseudo view Cannot commit to branch %(branch)s. It is bound to %(master)s, which is bound to %(remote)s. Cannot convert from format %(from_format)s to format %(format)s. %(problem)s Cannot debug memory on win32 without ctypes or win32process Cannot do conflict reduction and show base. Cannot find registered bug tracker called %(abbreviation)s on %(branch)s Cannot join {0}. {1} Cannot lock %(lock)s: %(why)s Cannot lock: transport is read only: %(transport)s Cannot operate on "%(filename)s" because it is a control file Cannot operate on "%(filename)s" of unsupported kind "%(kind)s" Cannot perform local-only commits on unbound branches. Cannot pull --overwrite to a branch which is bound %(branch)s Cannot pull individual files Cannot set both --verbose and --null Cannot sign a range of non-revision-history revisions Cannot switch a branch, only a checkout. Cannot switch as local commits found in the checkout. Commit these to the bound branch or use --force to throw them away. 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 Cannot verify a range of non-revision-history revisions Case insensitive ignore patterns can be specified with regular expressions
by using the ``i`` (for ignore case) flag in the pattern. Certificate error: %(error)s Change "%(path)s" from %(this)s to %(other)s? Change target of "%(path)s" from "%(this)s" to "%(other)s"? Changes shelved with id "%d". Check if tree is clean. 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. Checking branch at '%s'. Checking repository at '%s'. Checking unused inventories Checking working tree at '%s'. Checkouts Checkouts are source trees that are connected to a branch, so that when
you commit in the source tree, the commit goes into that branch. They
allow you to use a simpler, more centralized workflow, ignoring some of
Bazaar's decentralized features until you want them. Using checkouts
with shared repositories is very similar to working with SVN or CVS, but
doesn't have the same restrictions. And using checkouts still allows
others working on the project to use whatever workflow they like. Column 1 - versioning/renames:: Column 2 - contents:: Column 3 - execute:: Combine a tree into its containing tree. Comma also has special meaning in URLs, because it denotes `segment parameters`_ Comma is also special in any file system paths that are specified. To use a literal
comma in a file system path, specify a URL and URL encode the comma:: Comma separated list of GPG key patterns which are acceptable for verification. CommandHooks
------------ Comments
^^^^^^^^ Commit changes into a new revision. Commit even if nothing has changed. Commit message. Commit refused because there are unknown files in the working tree. Committed revision %d. Committing%s Commonly used like this:
eval "`bzr bash-completion`" Compress the data within a repository. Config file %(filename)s is not UTF-8 encoded
Configuration Settings
======================= Configuration files are located in ``$HOME/.bazaar`` on Unix and
``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0`` on
Windows. (You can check the location for your system by using
``bzr version``.) Conflict Types
============== Conflict reduction is not supported for merge type %s. Conflicting tags in bound branch:
{0} Conflicts detected in working tree. Use "bzr conflicts" to list, "bzr resolve FILE" to resolve. Conflicts normally are listed as short, human-readable messages. If --text
is supplied, the pathnames of files with text conflicts are listed,
instead. (This is useful for editing all files with text conflicts.) Connection Timeout: %(msg)s%(orig_error)s Connection closed: %(msg)s %(orig_error)s Connection error: %(msg)s %(orig_error)s Container has data after end marker: %(excess)r Container has multiple records with the same name: %(name)s Contains the user's default configuration. The section ``[DEFAULT]`` is
used to define general configuration that will be applied everywhere.
The section ``[ALIASES]`` can be used to create command aliases for
commonly used options. Content Filters
=============== Content conflicts
----------------- Content filters are typically provided by plugins, so the first step
in using them is to install the relevant plugins and read their
documentation. Some plugins may be very specific about which files
they filter, e.g. only files ending in ``.java`` or ``.php``.
In other cases, the plugin may leave it in the user's hands to
define which files are to be filtered. This is typically done
using rule-based preferences. See ``bzr help rules`` for general
information about defining these. Content formats
--------------- Control whether SIGQUIT behaves normally or invokes a breakin debugger. Control whether to launch a debugger on error. ControlDirHooks
--------------- Conversion of content into/from working trees Convert the current branch into a checkout of the supplied branch.
If no branch is supplied, rebind to the last bound location. Convert the current checkout into a regular branch. Copying content Copying repository content as tarball... Corrupt or incompatible data stream: %(reason)s Corruption while decompressing repository file%(orig_error)s Could not acquire lock "%(lock)s": %(msg)s Could not determine branch to refer to. Could not determine revno for {%(revision_id)s} because its ancestry shows a ghost at {%(ghost_revision_id)s} Could not find an appropriate Differ for file "%(path)s" Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s Could not parse --commit-time: Could not parse options for index %(value)s. Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s Could not rename %(source)s => %(dest)s because both files exist. (Use --after to tell bzr about a rename that has already happened)%(extra)s Could not understand response from smart server: %(response_tuple)r 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. Create the target branch from this one before switching to it. Create, remove or modify a tag naming a revision. Created a {0} (format: {1})
Created new branch. Created new stacked branch referring to %s. Created tag %s. Creating new repository Criss-Cross Criss-crosses cause problems because of the way merge works. Bazaar's default
merge is a three-way merger; in order to merge OTHER into THIS, it must
find a basis for comparison, BASE. Using BASE, it can determine whether
differences between THIS and OTHER are due to one side adding lines, or
from another side removing lines. Criss-crosses mean there is no good choice for a base. Selecting the recent
merge points could cause one side's changes to be silently discarded.
Selecting older merge points (which Bazaar does) mean that extra conflicts
are emitted. Criss-crosses occur in a branch's history if two branches merge the same thing
and then merge one another, or if two branches merge one another at the same
time. They can be avoided by having each branch only merge from or into a
designated central branch (a "star topology"). Current Storage Formats Current storage formats Cycle in graph %(graph)r Debug Flags
=========== Decoded contents
Default rules for all branches are defined in the optional file
``BZR_HOME/rules``. Defines an external merge tool called <name> with the given command-line.
Arguments containing spaces should be quoted using single or double quotes. The
executable may omit its path if it can be found on the PATH. Defines the behaviour of signing revisions on commits. By default bzr will not
sign new commits. Defines the maximum file size the command line "add" operation will allow
in recursive mode, with files larger than this value being skipped. You may
specify this value as an integer (in which case it is interpreted as bytes),
or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of 0
will disable skipping. Delete all ignored files. 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 changes without applying them. Delete conflict files, merge and revert backups, and failed selftest dirs. Delete file "%(path)s"? Delete files unknown to bzr (default). Delete from bzr but leave the working copy. Delete obsolete packs to save disk space. Delete the view. Delete this tag rather than placing it. Deleted '%s' view.
Deleted all views.
Deleted changes with id "%d". Deleted tag %s. Deleting backup.bzr Deleting old repository content Deleting parent
--------------- Deletion Strategy Deprecated in: %s Description of the new revision. Destroy removed changes instead of shelving them. Detailed log format. Details on the configuration settings available Details on the logging formats available Determining hash hits Device or resource busy: "%(path)s"%(extra)s Did not understand bug identifier %(bug_id)s: %(reason)s. See "bzr help bugs" for more information on this feature. Diff format Diff format to use. Diff is not installed on this machine: %(msg)s Diff3 is not installed on this machine. Directory contains a branch, but no working tree (use bzr checkout if you wish to build a working tree): "%(path)s" Directory not empty: "%(path)s"%(extra)s Disabled '%s' view.
Disabling ``myplugin`` and ``yourplugin`` is achieved by:: Disabling all plugins (better achieved with --no-plugins):: Disabling the site directory while retaining the user directory:: Discovering What Has Diverged
----------------------------- Display all the defined values for the matching options. 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 active value for a given option. Display the default ignore rules that bzr uses. Display timezone as local, original, or utc. Display, set or remove a configuration option. Diverged Branches
================= Do not actually open the browser. Just say the URL we would use. Do not ask for confirmation before breaking the lock. Do not consider changes made to a given path. Do not include a bundle in the merge directive. Do not include a preview patch in the merge directive. Do not mark object type using indicator. Do not prompt before deleting. Do not rebase after push. 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 actually make changes. Don't actually sign anything, just print the revisions that would be signed. Don't backup changed files. Don't check that the user name is valid. Don't know how to handle SSH connections. Please set BZR_SSH environment variable. 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. Dry-run, pretending to remove the above revisions.
Duplicate paths
--------------- 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. EOL conversion is provided as a content filter where Bazaar internally
stores a canonical format but outputs a convenience format. See
``bzr help content-filters`` for general information about using these. EOL conversion needs to be enabled for selected file patterns using
rules. See ``bzr help rules`` for general information on defining rules.
Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or
%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be
supported in a future verison of Bazaar. Each branch can also contain a configuration file that sets values specific
to that branch. This file is found at ``.bzr/branch/branch.conf`` within the
branch. This file is visible to all users of a branch, if you wish to override
one of the values for a branch with a setting that is specific to you then you
can do so in ``locations.conf``. Each description also indicates whether the hook runs on the client (the
machine where bzr was invoked) or the server (the machine addressed by
the branch URL). These may be, but are not necessarily, the same machine. Each section could define: Each section describes an authentication definition. Each section should define: Each type of conflict is explained below, and the action which must be done to
resolve the conflict is outlined. Empty commit message specified. Please specify a commit message with either --message or --file or leave a blank message with --message "". Enable completions for the selected plugin (default: all plugins) End of Line Conversion
====================== End of line marker was not \n in bzr revision-bundle Environment Variables Environment settings
--------------------- Environment variable names and values Error in command line options Error in data for index %(value)s. Error in merge modified format Error in processing weave: %(msg)s Error reading from %(path)r. Error(s) parsing config file %(filename)s:
%(errors)s Example:
~~~~~~~~ Excluding paths during commit is not supported by repository at %(repository)r. Experimental and deprecated storage formats Experimental formats are shown below. Explain how to use --revision 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. Exporting message from error: %s Exporting messages from builtin command: %s Exporting messages from plugin command: {0} in {1} External Merge Tools
-------------------- Failed to GPG sign data with command "%(command_line)s" Failed to GetProcessMemoryInfo() Failed to rename %(from_path)s to %(to_path)s: %(why)s Failed to verify GPG signature data with error "%(error)s" Fetch texts Fetching revisions File %(filename)s is not conflicted. File exists: %(path)r%(extra)s File format
----------- File id {%(file_id)s} already exists in inventory as %(entry)s File is binary but should be text. Filename %(filename)r is not valid in your current filesystem encoding %(fs_encoding)s Files Files
----- Files cannot be moved between branches. Filter on local branch revisions (inclusive). See "help revisionspec" for details. Filter on other branch revisions (inclusive). See "help revisionspec" for details. Find the proposal to merge this revision. Finding Launchpad branch Finding branch files Finding merge Finding proposals Finding revision-id Finding revisions Finding revno Finds the merge proposal(s) that discussed landing the specified revision.
This works only if the selected branch was the merge proposal target, and
if the merged_revno is recorded for the merge proposal. The proposal(s)
are opened in a web browser. Fixing last revision info {0} => {1} Fixing text parents For ``locations.conf``, the options from the section with the
longest matching section header are used to the exclusion of other
potentially valid section headers. A section header uses the path for
the branch as the section header. Some examples include:: For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin
with '~' as meaning that the rest of the path should be interpreted
relative to the remote user's home directory. For example if the user
``remote`` has a home directory of ``/home/remote`` on the server
shell.example.com, then:: For checkouts, the bind-to location will be auto-detected if not specified.
The order of preference is
1. For a lightweight checkout, the current bound location.
2. For branches that used to be checkouts, the previously-bound location.
3. The push location.
4. The parent location.
If none of these is available, --bind-to must be specified. For complicated changes, it is possible to edit the changes in a separate
editor program to decide what the file remaining in the working copy
should look like. To do this, add the configuration option For example, a case insensitive match for ``foo`` may be specified as:: For example, if you have a directory named '/tmp/%2False' these are all valid
ways of accessing the content (0x2F, or 47, is the ASCII code for forward slash):: For example, the ``appendpath`` policy can be used like this:: For example, to push to the parent location:: For example:: For lightweight checkouts, this changes the branch being referenced.
For heavyweight checkouts, this checks that there are no local commits
versus the current bound branch, then it makes the local branch a mirror
of the new location and binds to it. For more information on the possible uses of the authentication configuration
file see :doc:`authentication-help`. For more information on upgrades, see the Bazaar Upgrade Guide,
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/. For more information see http://help.launchpad.net/
For most conflict types, there are some obvious ways to modify the working
tree and put it into the desired state. For some types of conflicts, Bazaar
itself already made a choice, when possible. For new projects, it is recommended that end-of-lines be stored as ``lf``
and that users stick to the basic settings, i.e. ``native``, ``lf``,
``crlf`` and ``exact``. For performance reasons, Bazaar caches the timestamps of files in
a working tree, and assumes files are unchanged if their timestamps
match the cached values. As a consequence, there are times when
you may need to explicitly ask for content filtering to be reapplied
in one or both directions, e.g. after installing or reconfiguring
plugins providing it. For the bug trackers not listed above configuration is required.
Support for generating the URLs for any project using Bugzilla or Trac
is built in, along with a template mechanism for other bugtrackers with
simple URL schemes. If your bug tracker can't be described by one
of the schemes described below then you can write a plugin to support
it. For users working on a cross-platform project, here is a suggested rule
to use as a starting point:: For users working on an existing project that uses Windows newline
conventions in their Bazaar repository, this rule is suggested as a
starting point:: Format %(format)s cannot be initialised by this version of bzr. Format %(format)s is not compatible with .bzr version %(bzrdir)s. Format 0.9 does not permit bundle with no patch Format error in conflict listings 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). Format used by GNU ChangeLog files. Found %d dependent branches - upgrading ... General format
~~~~~~~~~~~~~~ Generate a shell function for bash command line completion. Generate only the shell function, don't enable it Generic bzr smart protocol error: %(details)s Generic path error: %(path)r%(extra)s) Get file contents from this tree. Ghost revision {%(revision_id)s} cannot be used here. Ghost tags not supported by format %(format)r. Giving a list of files will revert only those files. Otherwise, all files
will be reverted. If the revision is not specified with '--revision', the
working tree basis revision is used. A revert operation affects only the
working tree, not any revision history like the branch and repository or
the working tree basis revision. Global Options HPSS calls: {0} ({1} vfs) {2} HTTP MIME Boundary missing for %(path)s: %(msg)s HTTPS, SFTP servers and their proxy
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Handling such orphans, *before* the conflict is created, is controlled by
setting the ``bzr.transform.orphan_policy`` configuration option. Hard-link working tree files where possible. Hard-linking "%(path)s" is not supported Help on status flags Here are some general guidelines for doing this: How to fix diverged branches How to resolve the conflict. How you deal with this depends on *why* the branches are out of sync. However the checkout is still a first class branch in Bazaar terms, so that
you have the full history locally. As you have a first class branch you can
also commit locally if you want, for instance due to the temporary loss af a
network connection. Use the --local option to commit to do this. All the local
commits will then be made on the master branch the next time you do a non-local
commit. If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a
revision range. Examples: '3647..3649', 'date:yesterday..-1' and
'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes or
spaces around the '..'). If --all is specified, NAME is interpreted as a regular expression and all
matching options are displayed mentioning their scope. The active value
that bzr will take into account is the first one displayed for each option. If --all is specified, no FILE may be provided If --no-bundle is specified, then Bazaar doesn't send the contents of the
revisions, but only a structured request to merge from the
public_location. In that case the public_branch is needed and it must be
up-to-date and accessible to the recipient. The public_branch is always
included if known, so that people can check it later. If --revision is specified, uncommit revisions to leave the branch at the
specified revision. For example, "bzr uncommit -r 15" will leave the
branch at revision 15. 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 ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the
the way the plugin are searched. 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 revision is specified, changes since that revision will be shelved. 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 filenames are specified, only the changes to those files will be
shelved. Other files will be left untouched. If location is not specified the local tree is used.
If committer is not specified the default committer is used. If mail is being sent, a to address is required. This can be supplied
either on the commandline, by setting the submit_to configuration
option in the branch itself or the child_submit_to configuration option
in the submit branch. If no NAME is given, --all .* is implied. 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 options are specified, unknown files are deleted. Otherwise, option
flags are respected, and may be combined. 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 no tag name is specified it will be determined through the
'automatic_tag_name' hook. This can e.g. be used to automatically tag
upstream releases by reading configure.ac. See ``bzr help hooks`` for
details. If one of the standard log formats does not meet your needs, additional
formats can be provided by plugins.
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 present, defines the ``--strict`` option default value for checking
uncommitted changes before pushing into a different VCS without any
custom bzr metadata. If present, defines the ``--strict`` option default value for checking
uncommitted changes before pushing. If present, defines the ``--strict`` option default value for checking
uncommitted changes before sending a merge directive. If present, the location of a generic bug tracker instance referred to by
<tracker>. The location must contain an ``{id}`` placeholder,
which will be replaced by a specific bug ID. This option can then be used
together with ``bzr commit --fixes`` to mark bugs in that tracker as being
fixed by that commit. For example:: If present, the location of the Bugzilla bug tracker referred to by
<tracker>. This option can then be used together with ``bzr commit
--fixes`` to mark bugs in that tracker as being fixed by that commit. For
example:: If present, the location of the Trac instance referred to by
<tracker>. This option can then be used together with ``bzr commit
--fixes`` to mark bugs in that tracker as being fixed by that commit. For
example:: If present, the location of the default branch for pull or merge. This option
is normally set when creating a branch, the first ``pull`` or by ``pull
--remember``. If present, the location of the default branch for push. This option
is normally set by the first ``push`` or ``push --remember``. 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 set to "True" then revisions can only be appended to the log, not
removed. A branch with this setting enabled can only pull from another
branch if the other branch's log is a longer version of its own. This is
normally set by ``bzr init --append-revisions-only``. If you set it
manually, use either 'True' or 'False' (case-sensitive) to maintain
compatibility with previous bzr versions (older than 2.2). If set to "True", the branch should act as a checkout, and push each commit to
the bound_location. This option is normally set by ``bind``/``unbind``. If set to true, bzr will automatically break locks held by processes from
the same machine and user that are no longer alive. Otherwise, it will
print a message and you can break the lock manually, if you are satisfied
the object is no longer in use. If shelve --list is specified, previously-shelved changes are listed. 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 origin is the same for a run of consecutive lines, it is
shown only at the top, unless the --all option is given. 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 true (default), repository changes are flushed through the OS buffers
to physical disk. This is somewhat slower, but means data should not be
lost if the machine crashes. See also dirstate.fdatasync. If true (default), working tree metadata changes are flushed through the
OS buffers to physical disk. This is somewhat slower, but means data
should not be lost if the machine crashes. See also repository.fdatasync. If unset, the colocated branch name is used for colocated branches, and
the branch directory name is used for other branches. To print the
current nickname, execute with no argument. If you are using a checkout from a shared branch you will periodically want to
pull in all the changes made by others. This is done using the "update"
command. The changes need to be applied before any non-local commit, but
Bazaar will tell you if there are any changes and suggest that you use this
command when needed. If you edit the main copy, be sure to remove the herringbone markers. When
you are done editing, the file should look like it never had a conflict, and be
ready to commit. If you have a branch and the remote branch is out-of-date, you can push
the local changes using "bzr push". If the local branch is out of date, you
can do "bzr pull". If both branches have had changes, you can merge, commit
and then push your changes. If you decide that some of the changes aren't
useful, you can "push --overwrite" or "pull --overwrite" instead.
If you have a branch with a working tree that you do not want the 'remove-tree'
command will remove the tree if it is safe. This can be done to avoid the
warning about the remote working tree not being updated when pushing to the
branch. It can also be useful when working with a '--no-trees' repository
(see 'bzr help repositories'). If you have a branch with no working tree you can use the 'checkout' command
to create a working tree. If you run 'bzr checkout .' from the branch it will
create the working tree. If the branch is updated remotely, you can update the
working tree by running 'bzr update' in that directory. If you have a checkout and have done local commits, you can get back in sync
by running "bzr update" (and possibly "bzr commit"). If you have an existing repository with text files already stored using
Windows newline conventions (``crlf``), then you may want to keep using that
convention in the repository. Forcing certain files to this convention
may also help users who do not have rules configured. To do this, set
``eol`` to one of the values below. If you have binary files that do not contain a null byte though, be
sure to add ``eol = exact`` rules for those as well. You can do this
by giving more explicit patterns earlier in the rules file. For example:: 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 have sample test data that deliberately has text files with mixed
newline conventions, you can ask for those to be left alone like this:: If you need to change the order or remove one of these
directories, you should use special values: 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 take the care to create files with their required endings, you can
achieve *almost* the same thing by using ``eol = exact``. It is slightly
safer to use ``lf`` and ``crlf`` though because edits accidentally
introducing mixed line endings will be corrected during commit for files
with those settings. If you use Bugzilla or Trac, then you only need to set a configuration
variable which contains the base URL of the bug tracker. These options
can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific
configuration section in ``locations.conf``. You can set up these values
for each of the projects you work on. 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 have a working tree on a remote machine that you push to you
can either run 'bzr update' in the remote branch after each push, or use some
other method to update the tree during the push. There is an 'rspush' plugin
that will update the working tree using rsync as well as doing a push. There
is also a 'push-and-update' plugin that automates running 'bzr update' via SSH
after each push. 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. If your working tree is on a network drive shared by users on different
operating systems, you typically want to force certain conventions for
certain files. In that way, if a file is created with the wrong line
endings or line endings get mixed during editing, it gets committed
correctly and gets checked out correctly. For example:: Ignore differences between branches and overwrite unconditionally. Ignore patterns may be prefixed with ``!``, which means that a filename
matched by that pattern will not be ignored. Ignore specified files or patterns. Ignoring files outside view. View is %s Importing revisions In addition, one branch may be bound to another one. Binding to another
branch indicates that commits which happen in this branch must also
happen in the other branch. Bazaar ensures consistency by not allowing
commits when the two branches are out of date. In order for a commit
to succeed, it may be necessary to update the current branch using
``bzr update``. In addition, plugins can provide other keywords. In both cases, the working tree is updated and uncommitted changes
are merged. The user can commit or revert these as they desire. In both cases, when used in a directory like
``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get:: In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may give
better results. You may wish to ``bzr revert`` the working tree and merge
again. Alternatively, use ``bzr remerge`` on particular conflicted files. In future it is planned that ``when-required`` will sign newly
committed revisions only when the branch requires them. ``never`` will refuse
to sign newly committed revisions, even if the branch requires signatures. In most cases, a view has a short life-span: it is created to make
a selected change and is deleted once that change is committed.
At other times, you may wish to create one or more named views
and switch between them. 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 order to calculate those changes, bzr must analyse the submit branch.
Therefore it is most efficient for the submit branch to be a local mirror.
If a public location is known for the submit_branch, that location is used
in the merge directive. 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 that case, ``bzr`` will stop loading the specified plugins and
will raise an import error if they are explicitly imported (by
another plugin that depends on them for example). In the main copy of the file, Bazaar will include all the changes that it
could reconcile, and any un-reconciled conflicts are surrounded by
"herringbone" markers like ``<<<<<<<``. In the shp.net (fictitious) domain, each project has its own site:: In this situation, Bazaar will cancel the move, and leave ``white`` in
``black``. To resolve that kind of conflict, you just have to decide what
name should be retained for the directories involved. 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. Include all possible information. Include the last revision for each file. Include the revision-history. Inconsistency in dirstate file %(dirstate_path)s.
Error: %(description)s InfoHooks
--------- Information on choosing a storage format Information on configuration and log files Information on configuring authentication Information on criss-cross merging Information on defining rule-based preferences Information on end-of-line handling Information on the pattern syntax Information on what a branch is Information on what a checkout is Information on what a standalone tree is Information on working trees Insert claimed random_id=True, but then inserted %r two times Install revisions Instead of merging, show a diff of the merge. Instead of unshelving the changes, show the diff that would result from unshelving. Instead of using:: Integration with Launchpad.net Internally bzr treats all locations as URLs. For any file system paths
that are specified it will automatically determine the appropriate URL
representation, and escape special characters where necessary. Introduced in: %s Introduced in: 0.15 Introduced in: 0.16 Introduced in: 0.91 Introduced in: 1.10 Introduced in: 1.13 Introduced in: 1.14 Introduced in: 1.15 Introduced in: 1.15.0 Introduced in: 1.17 Introduced in: 1.4 Introduced in: 1.6 Introduced in: 1.8 Introduced in: 1.9 Introduced in: 2.0 Introduced in: 2.1 Introduced in: 2.2 Introduced in: 2.3 Introduced in: 2.4 Introduced in: 2.5 Introduced in: 2.6 Introduced in: unknown Introduction
------------ Invalid '%s', should be of the form 'name=value' Invalid URL join request: %(reason)s: %(base)r + %(join_args)r Invalid branch name: %(name)s Invalid bug %s. Must be in the form of 'tracker:id'. See "bzr help bugs" for more information on this feature.
Commit refused. Invalid bug status: '%(status)s' Invalid config value for "{0}" value {1!r} is not an SI unit. Invalid http Content-type "%(ctype)s" for %(path)s: %(msg)s 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 line in bugs property: '%(line)s' Invalid pattern(s) found. %(msg)s Invalid range access in %(path)s at %(offset)s: %(msg)s Invalid record: %(reason)s Invalid revision number %(revno)s Invalid revision-id {%(revision_id)s} in %(branch)s Invalid url supplied to transport: "%(path)s"%(extra)s Inventory ok. Inventory regenerated. Invoked after a repository has been initialized. post_repo_init is
called with a bzrlib.controldir.RepoInitHookParams. Invoked before attempting to open a ControlDir with the transport that
the open will use. Invoked when a config option is read. The signature is (stack, name,
value). Invoked when a config option is removed. The signature is (stack,
name). Invoked when a config option is set. The signature is (stack, name,
value). Invoked when a config store is loaded. The signature is (store). Invoked when a config store is saved. The signature is (store). Invoked when adding information about a revision to the RIO stanza
that is printed. revision is called with a revision object and a RIO
stanza.
Invoked when displaying the statistics for a repository. repository is
called with a statistics dictionary as returned by the repository and
a file-like object to write to. It is a good idea to create a repository whenever you might create more
than one branch of a project. This is true for both working areas where you
are doing the development, and any server areas that you use for hosting
projects. In the latter case, it is common to want branches without working
trees. Since the files in the branch will not be edited directly there is no
need to use up disk space for a working tree. To create a repository in which
the branches will not have working trees pass the '--no-trees' option to
'init-repository'. It is also possible to create a "lightweight" checkout by passing the
--lightweight flag to checkout. A lightweight checkout is even closer to an
SVN checkout in that it is not a first class branch, it mainly consists of the
working tree. This means that any history operations must query the master
branch, which could be slow if a network connection is involved. Also, as you
don't have a local branch, then you cannot commit locally. It is an error to give a tag name that already exists unless you pass
--force, in which case the tag is moved to point to the new revision. It is not possible to losslessly push to %s. You may want to use dpush instead. It is overridden by the BZR_REMOTE_PATH environment variable. It is possible (though very rare) for Bazaar to raise a MalformedTransform
exception. This means that Bazaar encountered a filesystem conflict that it was
unable to resolve. This usually indicates a bug. Please let us know if you
encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs
It sure does!
Keep tags that point to removed revisions. Key %(key)s is already present in map Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by format %(format)r LCA-newness merge. LOCATION is the directory where the config lock is. Launchpad
--------- Launchpad project short name to associate with the branch. Launchpad user ID exists and has SSH keys.
Launchpad user ID set to '%s'.
Launchpad.net provides free Bazaar branch hosting with integrated bug and
specification tracking. Lightweight checkouts work best when you have fast reliable access to the
master branch. This means that if the master branch is on the same disk or LAN
a lightweight checkout will be faster than a heavyweight one for any commands
that modify the revision history (as only one copy of the branch needs to
be updated). Heavyweight checkouts will generally be faster for any command
that uses the history but does not change it, but if the master branch is on
the same disk then there won't be a noticeable difference. Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may be
regular files, symlinks or directories). But it will not include a "main copy"
of the file with herringbone conflict markers. It will appear that the "main
copy" has been renamed to THIS or OTHER. 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 files with conflicts. List ignored files and the patterns that matched them. List paths of files with text conflicts. List shelved changes. List tags. List the branches available at the current location. List the installed plugins. Listen for connections on nominated address. Listen for connections on nominated port. Passing 0 as the port number will result in a dynamically allocated port. The default port depends on the protocol. Local branch is not bound Location
~~~~~~~~ Location aliases
================ Location fo the repository. Location of the Bazaar log file. You can check the current location by
running ``bzr version``. Lock is apparently held, but corrupted: %(corruption_info)s
Use 'bzr break-lock' to clear it Lock not held: %(lock)s Lock owner changed for Lock was broken while still open: %(lock)s - check storage consistency! Lock was released and re-acquired before being broken: %(lock)s: held by %(holder)r, wanted to break %(target)r LockHooks
--------- Log Formats
=========== Log format Log format with one line per revision. Logging revision 0 is invalid. Longer description of the purpose or contents of the branch. Lookup file ids from this tree. Loop involving %(refs)r while expanding "%(string)s". Mail client "%s" does not support specifying body Mail is sent using your preferred mail program. This should be transparent
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
If the preferred client can't be found (or used), your editor will be used. Mail or create a merge-directive for submitting changes. Mail the request to this address. Make %s lock Make a directory into a versioned branch. Malformed bzr revision-bundle header: %(text)r Malformed footer in bzr revision-bundle: %(text)r Malformed hunk header. %(desc)s
%(line)r Malformed line. %(desc)s
%(line)r Malformed patch header. %(desc)s
%(line)r Malformed patches in bzr revision-bundle: %(text)r MalformedTransform
------------------ Manage filtered views. Manually set a commit time using commit date format, e.g. '2009-10-10 08:00:00 +0100'. Many commands that accept URLs also accept location aliases too.
See :doc:`location-alias-help` and :doc:`url-special-chars-help`.
Many different authentication policies can be described in the
``authentication.conf`` file but a particular user should need only a few
definitions to cover his needs without having to specify a user and a password
for every branch he uses. Many of these converters will provide *round-trip* conversion,
i.e. applying the read converter followed by the write converter
gives back the original content. However, others may provide an
asymmetric conversion. For example, a read converter might strip
trailing whitespace off lines in source code while the matching
write converter might pass content through unchanged. Mark a bug as being fixed by this revision (see "bzr help bugs"). Mark a conflict as resolved. Mark the proposal as approved immediately. Marks the conflict as resolved. Merge algorithm Merge even if the destination tree has uncommitted changes. Merge using external diff3. Merge will do its best to combine the changes in two branches, but there
are some kinds of problems only a human can fix. When it encounters those,
it will mark a conflict. A conflict means that you need to fix something,
before you can commit. MergeDirectiveHooks
------------------- MergeHooks
---------- Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562 Message string. Message: %s MessageEditorHooks
------------------ Method to use for writing diffs. Mismatched internal revid {{{0}}} and index revid {{{1}}} Missing feature %(feature)s not provided by this version of Bazaar or any plugin. Missing parent
-------------- Moderately short log format. Move only the bzr identifier of the file, because the file has already been moved. Move or rename a file. Moving %s Moving repository to repository.backup Moving the root directory is not supported at this time Multiple definitions can be provided and, for a given URL, bzr will select a
(``user`` [, ``password``]) based on the following rules : Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects {{{4}}} MutableTreeHooks
---------------- NAME_PATTERN should not be an absolute path Name of the generated function (default: _bzr) Name of the root directory inside the exported file. Name of the view to define, list or delete. Name of the view to switch to. Native diff3-style merge. 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 %(alias_name)s location assigned. No GnuPG key results for pattern: {0} No Launchpad user ID configured.
No WorkingTree exists for "%(base)s". No branch found at specified location. No bundle was found in "%(filename)s". No changes are shelved with id "%(shelf_id)d". No changes are shelved. No changes to commit No changes to commit. Please 'bzr add' the files you want to commit, or use --unchanged to force an empty commit. No compatible object available for operations from %(source)r to %(target)r. No current view to delete No current view to disable No current view.
No error if existing, make parent directories as needed. No files deleted. No final name for trans_id %(trans_id)r
file-id: %(file_id)r
root trans-id: %(root_trans_id)r
No help could be found for '%(topic)s'. Please use 'bzr help topics' to obtain a list of topics. No help for this command. No known version info format {0}. Supported types are: {1} No location could be found to bind to at %(display_url)s. No location specified or remembered No location supplied and no previous location known No location supplied. This format does not remember old locations. No mail-to address (--mail-to) or output (-o) specified. No matching files. No message supplied. No namespace registered for string: %(spec)r No new revisions or tags to push. No new revisions to push. No peer location known or specified. No public branch specified or known 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 repository found at specified location. No repository present: "%(path)s" No review found. No revisions to bundle. No revisions to submit. No revisions to uncommit.
No shelved changes. No submit branch available for branch "%(path)s" No submit branch known or specified No submit branch specified or known No such file: %(path)r%(extra)s No such send format '%s'. No such tag: %(tag_name)s No such view: %(view_name)s. No tag specified to delete. No target configuration specified No template specified. 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 views defined.
No working tree found at specified location. No working tree to remove No working tree. Non-directory parent
-------------------- Not a branch: "%(path)s"%(detail)s. Not a bzr revision-bundle: %(text)r Not currently building a tree. 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 ``basename`` here refers to the base name of ``relpath`` which
itself is defined as the relative path between the section name and the
location it matches. Note that ``exact`` does not imply the file is binary but it does mean
that no conversion of end-of-lines will be done. (Bazaar currently relies
of content analysis to detect binary files for commands like ``diff``.
In the future, a ``binary = true`` rule may be added but it is not
supported yet.) Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these
modifications will be taken into account. Note that the special values 'user', 'core' and 'site' should be
used literally, they will be substituted by the corresponding,
platform specific, values. Note that this is the default action when a single file is involved so you can
simply use:: Note that when merging a directory deletion, if unversioned files are
present, they become potential orphans has they don't have a directory
parent anymore. 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 that you must get rid of FILE.moved before using ``--action=done``. Note: As you provide a short name for each tracker, you can specify one or
more bugs in one or more trackers at commit time if you wish. Note: Bazaar's EOL conversion will convert the content of files but
never reject files because a given line ending or mixed line endings
are found. A precommit hook should be used if you wish to validate
(and not just convert) content before committing.
Note: Content filtering is only supported in recently added formats,
e.g. 1.14. Be sure that both the repository *and* the branch are
in a recent format. (Just setting the format on the repository
is not enough.) If content filtering does not appear to be working, use
'bzr info -v' to confirm that the branch is using "Working tree format 5"
or later. Note: Export of tree with non-ASCII filenames to zip is not supported. Note: For safety reasons, no conversion is applied to any file where a null
byte is detected in the file. Note: In the future, it is likely that additional options will be added
to commands to make this refreshing process faster and safer.
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. Note: ``bzr commit`` does not implicitly apply write converters after
comitting files. If this makes sense for a given plugin providing
a content filter, the plugin can usually achieve this effect by using a
``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`
for more information on hooks. Nothing to delete. Nothing to do. Nothing to merge. Number of levels to display - 0 for all, 1 for flat. OTHER_BRANCH may be local or remote. Obviously to commit on a checkout you need to be able to write to the master
branch. This means that the master branch must be accessible over a writeable
protocol , such as sftp://, and that you have write permissions at the other
end. Checkouts also work on the local file system, so that all that matters is
file permissions. Once converted into a checkout, commits must succeed on the master branch
before they will be applied to the local branch. Once the relevant credentials are declared in this file you may use branch urls
without embedding passwords (security hazard) or even users (enabling sharing
of your urls with others). Once you have fixed a problem, use "bzr resolve" to automatically mark
text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict as
resolved, or "bzr resolve --all" to mark all conflicts as resolved. One-sentence description of the branch. Only ASCII permitted in option names Only display errors and warnings. Only one path may be specified to --auto. Only remove files that have never been committed. Only remove the commits from the local branch when in a checkout. Only show versioned files. Only useful in ``locations.conf``. Defines whether or not the
configuration for this section applies to subdirectories: Open a Launchpad branch page in your web browser. Opening %s in web browser Operation denied because it would change the main history, which is not permitted by the append_revisions_only setting on branch "%(location)s". Option %(name)s is not defined while expanding "%(string)s". Option --change does not accept revision ranges Option policies
^^^^^^^^^^^^^^^ Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value will be saved. Options defined in a section affect the named directory or URL plus
any locations they contain. Policies can be used to change how an
option value is interpreted for contained locations. Currently
there are three policies available: Options that can be used with any command Options that control how Bazaar runs Options to show or record debug information Other Storage Formats Other branch has no new revisions.
Override the default idle client timeout (5min). Override the email id used by Bazaar. Typical format:: Override the home directory used by Bazaar. Override the progress display. Possible values are "none" or "text". If
the value is "none" then no progress bar is displayed. The value "text" draws
the ordinary command line progress bar. Overriding the default site plugin directory:: Overriding the default user plugin directory:: Overwrite tags only. 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. PageFaultCount %8d PagefileUsage %8d KiB Parameter {0!r} encoding is unsupported by {1} application locale. Parent branch already exists: "%(path)s". Parent directory of %s does not exist.
You may supply --create-prefix to create all leading parent directories. Parent loop
----------- Parent not accessible given base "%(base)s" and relative path "%(path)s" Parent of "%s" does not exist. Parents are mismatched between two revisions. %(msg)s Parse error on line %(lineno)d of %(format)s format: %(line)s Pass these options to the external diff program. Patch_type was %(patch_type)s, but no patch was supplied. Path "%(path)s" is not a child of path "%(base)s"%(extra)s Path "%(path)s" is not unicode normalized Path conflict
------------- Path to the Bazaar executable to use when using the bzr+ssh protocol. Path to the editor Bazaar should use for commit messages, etc. Path unknown at end or start of revision range: %s Path(s) are not versioned: %(paths_as_string)s Path(s) do not exist: %(paths_as_string)s%(extra)s Patterns
======== Patterns are ordered and searching stops as soon as one matches.
As a consequence, more explicit patterns should be placed towards
the top of the file. Rule patterns use exactly the same conventions
as ignore patterns. See :doc:`patterns-help` for details. Patterns may also be `Python regular expressions`_. Regular expression
patterns are identified by a ``RE:`` prefix followed by the regular
expression. Regular expression patterns may not include named or
numbered groups. Patterns may include globbing wildcards such as:: 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. PeakPagefileUsage %8d KiB PeakWorking %8d KiB Pending merges must be committed or reverted before using switch. Pending merges need to be committed or reverted before using switch. 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. Perform reconfiguration even if local changes will be lost. Permission denied: "%(path)s"%(extra)s Plaintext diff output. Please specify a tag name. Please specify smtp_server. No server at default %(host)s. Please supply either one revision, or a range. Plugins (including hooks) are run on the server if all of these is true: Plugins specified in this environment variable takes precedence
over the ones in ``BZR_PLUGIN_PATH``. Points at which custom processing can be added Policies are specified by keys with names of the form "<option_name>:policy".
For example, to define the push location for a tree of branches, the
following could be used:: Preferences like these are useful for commands and plugins wishing to
provide custom behaviour for selected files. For more information on
end of line conversion see :doc:`eol-help`.
Keyword support is provided by the `keywords plugin
<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_. Prepare the request but don't actually send it. Preparing file merge Preview patch does not match requested changes. 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. PrivateUsage %8d KiB Produce a strict-format testament. Produce long-format testament. Profile data written to "%s". Propose merging a branch on Launchpad. Propose the merge on staging. Protocol to serve. Public branch "%(public_location)s" lacks revision "%(revstring)s". Push into a different VCS without any custom bzr metadata. Pushed up to revision %d. Pushing to %s Ranges are interpreted differently by different commands. To the "log" command,
a range is a sequence of log messages, but to the "diff" command, the range
denotes a change between revisions (and not a sequence of changes). In
addition, "log" considers a closed range whereas "diff" and "merge" consider it
to be open-ended, that is, they include one end but not the other. For example:
"bzr log -r 3647..3649" shows the messages of revisions 3647, 3648 and 3649,
while "bzr diff -r 3647..3649" includes the changes done in revisions 3648 and
3649, but not 3647. Read converters are only applied to commands that read content from
a working tree, e.g. status, diff and commit. For example, ``bzr diff``
will apply read converters to files in the working tree, then compare
the results to the content last committed. Reading indexes Reading inventory data Received bad protocol version marker: %(marker)r Recipe for importing a tree of files:: Reconcile aborted: revision index has inconsistent parents. Reconcile bzr metadata in a branch. Reconciliation complete. Reconciling branch %s Reconciling repository Reconciling repository %s Reconfigure a branch to be stacked on another branch. Reconfigure a branch to be unstacked. This may require copying substantial data into it. Reconfigure repository to create working trees on branches by default. Reconfigure repository to not create working trees on branches by default. Reconfigure the type of a bzr directory. Reconfigure to be a bound branch with a working tree. Reconfigure to be a lightweight checkout (with no local history). Reconfigure to be a standalone branch (i.e. stop using shared repository). Reconfigure to be an unbound branch with a working tree. Reconfigure to be an unbound branch with no working tree. Reconfigure to use a shared repository. Records
Recurse into subdirectories. Recursively scan for branches rather than just looking in the specified location. Redo a merge. Reduce the scope to the specified configuration file. 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. Refuse to send if there are uncommitted changes in the working tree, --no-strict disables the check. Register a branch with launchpad.net. Related Commands:: Related commands:: Remaining conflicts: Remember submit and public branch. Remember the specified location as a default. Remove a branch. Remove branch even if it is the active branch. Remove files or directories. Remove pending merge marker, without changing any files. Remove the alias. Remove the backup.bzr directory if successful. Remove the last committed revision. Remove the option from the configuration file. Remove the working tree even if it has uncommitted or shelved changes. Remove the working tree from a given branch/checkout. Remove unwanted files from working tree. Removing ancestry.weave Removing backup ... Rename "%(this)s" => "%(other)s"? Replace existing tags. Repositories Repositories are a form of database. Bzr will usually maintain this for
good performance automatically, but in some situations (e.g. when doing
very many commits in a short time period) you may want to ask bzr to
optimise the database indices. This can be done by the 'bzr pack' command. Repositories in Bazaar are where committed information is stored. There is
a repository associated with every branch. Repository %r does not support access to raw revision texts Repository format Repository type Reprocess to reduce spurious conflicts. Requested reconfiguration of '%(display_url)s' is not supported. Requested reviewer and optional type. Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s%(extra)s Requested to stop gracefully Rerun update after fixing the conflicts. Reserved for future use. These options will allow a policy for branches to
require signatures. Reserved revision-id {%(revision_id)s} Resolution pass Resolve all conflicts in this tree. Resolve the conflict preserving the version in the working tree. Resolve the conflict taking the merged version into account. Resolving conflicts is sometimes not obvious. Either because the user that
should resolve them is not the one responsible for their occurrence, as is the
case when merging other people's work or because some conflicts are presented
in a way that is not easy to understand. Restore shelved changes. Reverse the order of revisions. Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s Revision Identifiers Revision is not compatible with %(repo_format)s Revision numbers are always relative to the source branch. Revision {%(revision_id)s} already present in "%(file_id)s". Revision {%(revision_id)s} already present in %(weave)s Revision {%(revision_id)s} not present in "%(file_id)s". Revision {%(revision_id)s} not present in %(weave)s Revisions
Revisions are not derived from the same root: %(revision_a)s %(revision_b)s. Revisions have no common ancestor: %(revision_a)s %(revision_b)s RioVersionInfoBuilderHooks
-------------------------- Root class for inventory serialization errors Rule Patterns
------------- Rules
===== Rules are defined in ini file format where the sections are file glob
patterns and the contents of each section are the preferences for files
matching that pattern(s). For example:: Run "bzr check" for more details. Run the bzr server. SMTP connection to %(host)s refused SMTP error: %(error)s Same as --mine-only. Same as --theirs-only. Say the initial text is "The project leader released it.", and THIS modifies it
to "Martin Pool released it.", while OTHER modifies it to "The project leader
released Bazaar." A conflict would look like this:: Say yes to all questions. Section headers
^^^^^^^^^^^^^^^ Section local options
^^^^^^^^^^^^^^^^^^^^^ See "bzr help break-lock" for more. See "help revisionspec" for details. See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples. See :doc:`current-formats-help` for the complete list of
currently supported formats. See :doc:`other-formats-help` for
descriptions of any available experimental and deprecated formats.
See ``bzr help patterns`` for details on the syntax of patterns. See ``bzr help resolve`` for more details. See also the ``bzr_remote_path`` configuration option. See also the ``email`` configuration option. See bzr help %s for more details and examples.
See http://doc.bazaar.canonical.com/developers/profiling.html for more
information on profiling. See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
for further information on plugins including where to find them and how to
install them. Instructions are also provided there on how to write new
plugins using the Python programming language. Select a different SSH implementation. Select a particular merge algorithm. Select changes interactively. Select changes introduced by the specified revision. See also "help revisionspec". Select the output format. Selected changes destroyed. Selected changes: Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3. Selected-file commit of merges is not supported yet: files %(files_str)s Serve contents of this directory. Serve on stdin/out for use from inetd or sshd. Server sent an unexpected error: %(error_tuple)r Set a fixed commit message. set_commit_message is called with the
bzrlib.commit.Commit object (so you can also change e.g. revision
properties by editing commit.builder._revprops) and the message so
far. set_commit_message must return the message to use or None if it
should use the message editor as normal. Set files in the working tree back to the contents of a previous revision. 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 the branch of a checkout and update. Set/unset and display aliases. Setting a value is achieved by using name=value without spaces. The value
is set in the most relevant scope and can be checked by displaying the
option again. Setting ssh/sftp usernames for launchpad.net. Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms
will disable logging. Shared repository '%(display_url)s' already creates working trees. Shared repository '%(display_url)s' already doesn't create working trees. Shelf corrupt. Shelve %d change(s)? Shelve adding file "%(path)s"? Shelve all changes. Shelve allows you to temporarily put changes you've made "on the shelf",
ie. out of the way, until a later time when you can bring them back from
the shelf with the 'unshelve' command. The changes are stored alongside
your working tree, and so they aren't propagated along with your branch nor
will they survive its deletion. Shelve binary changes? Shelve changing "%s" from %(other)s to %(this)s? Shelve changing target of "%(path)s" from "%(other)s" to "%(this)s"? Shelve is intended to help separate several sets of changes that have
been inappropriately mingled. If you just want to get rid of all changes
and you don't need to restore them later, use revert. If you want to
shelve all text changes at once, use shelve --all. Shelve removing file "%(path)s"? Shelve renaming "%(other)s" => "%(this)s"? Shelve? Short name for the branch; by default taken from the last component of the url. Show all revisions in addition to the mainline ones. Show annotations on all lines. Show base revision text in conflicts. Show changes made in each revision as a patch. Show changes, but do not apply or remove them. Show commit date in annotations. 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 files to delete instead of deleting them. Show from oldest to newest. Show help message. 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 internal object ids. 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 or set the Launchpad 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 testament (signing-form) of a revision. Show the origin of each line in a file. Show the tree root directory. Show unmerged/unpulled revisions between two branches. Show usage message and options. Show version information about this tree. 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 Sign all commits by a given committer. Signed %d revision.
Signed %d revisions.
Since a lightweight checkout is little more than a working tree
this will refuse to run against one. SmartClientHooks
---------------- SmartServerHooks
---------------- So, to find the merge proposal that reviewed line 1 of README:: Some operations, like merge, revert and pull, modify the contents of your
working tree. These modifications are programmatically generated, and so they
may conflict with the current state of your working tree. Some options are defined automatically inside a given section and can be
refered to in this section only. Some smart servers or protocols *may* put the working tree in place in
the future. Sometimes Bazaar will attempt to create a file using a pathname that has
already been used. The existing file will be renamed to "FILE.moved". Sometimes Bazaar will attempt to create a file whose parent directory is not
versioned. This happens when the directory has been deleted in the target,
but has a new child in the source, or vice versa. In this situation, Bazaar
will version the parent directory as well. Resolving this issue depends
very much on the particular scenario. You may wish to rename or delete either
the file or the directory. When you are satisfied, you can run "bzr resolve
FILE" to mark the conflict as resolved. Sorry, remerge only works after normal merges. Not cherrypicking or multi-merges. Sort tags by different criteria. Sorting Source branch format does not support stacking, using format:
%s Source repository format does not support stacking, using format:
%s Special character handling in URLs Special character handling in URLs
================================== Specified file "%(file_name)s" is outside the current view: %(view_str)s Specifies the network proxy for outgoing connections, for example:: Specifies which external merge tool (as defined above) should be selected by
default in tools such as ``bzr qconflicts``. Specify a format for this branch. See "help formats". Specify a format for this repository. See "bzr help formats" for details. Split a subdirectory of a tree into a separate tree. Standalone Trees Standard Options Standard options are legal for all commands. Start revision must be older than the end revision. Start revision not found in history of end revision. Status Flags Status flags are used to summarise changes to the working tree in a concise
manner. They are in the form:: StatusHooks
----------- Steps to resolve "out-of-sync" when reconfiguring Still waiting for %d client(s) to finish Storage Formats Subsume target %(other_tree)s needs to be upgraded. Supported URL prefixes:: Supported generic values are: Supported modifiers:: Supported transport protocols Supported values for specific clients: Switch even if local commits will be lost. Switch the checkout in the current directory to the new branch. Switched to branch: %s Tag %(tag_name)s already exists. Tag %s already exists for that revision. Tag conflicts
------------- Tags are stored in the branch. Tags are copied from one branch to another
along when you branch, push, pull or merge. Tags can only be placed on a single revision, not on a range Tags give human-meaningful names to revisions. Commands that take a -r
(--revision) option can be given -rtag:X, where X is any previously
created tag. Tags not supported by %(branch)s; you may be able to use bzr upgrade. Take commit message from this file. Target directory "%s" already exists. Target directory %s already contains a .bzr directory, but it is not valid. Target directory %s already exists, but does not have a .bzr directory. Supply --use-existing-dir to push there anyway. Template for the output. Temporarily set aside some changes from the current tree. Testament did not match expected value.
For revision_id {%(revision_id)s}, expected {%(expected)s}, measured
{%(measured)s} Text conflicts
-------------- Text contents mismatch at line %(line_no)d. Original has "%(orig_line)s", but patch says it should be "%(patch_line)s" Text did not match its checksum: %(msg)s The "%(config_id)s" configuration does not exist. The "%(option_name)s" configuration option does not exist. The %(type)s hook '%(hook)s' is unknown in this version of bzrlib. 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 API for "%(api)s" is not compatible with "%(wanted)s". It supports versions "%(minimum)s" to "%(current)s". The Bazaar smart server protocol over TCP. (default port: 4155) The GnuPG user identity to use when signing commits. Can be an e-mail
address, key fingerprint or full key ID. When unset or when set to
"default" Bazaar will use the user e-mail set with ``whoami``. The TREE argument should be a subdirectory of a working tree. That
subdirectory will be converted into an independent tree, with its own
branch. Commits in the top-level tree will not apply to the new subtree. The TREE argument should be an independent tree, inside another tree, but
not part of it. (Such trees can be produced by "bzr split", but also by
running "bzr branch" with the target inside a tree.) The URL for bug tracker "%(abbreviation)s" doesn't contain {id}: %(url)s The ``--fixes`` option allows you to specify a bug tracker and a bug identifier
rather than a full URL. This looks like:: The ``bzr missing`` command is used to find out what revisions are in another
branch that are not present in the current branch, and vice-versa. It shows a
summary of which extra revisions exist in each branch. If you want to see the
precise effects of those revisions, you can use ``bzr diff --old=other_branch``
to show the differences between other_branch and your current branch. The ``password_encoding`` and ``verify_certificates`` fields are recognized but
ignored in the actual implementation.
The ``weave`` merge type is not affected by this problem because it uses
line-origin detection instead of a basis revision to determine the cause of
differences.
The above revision(s) will be removed.
The action to perform. The alias "%(alias_name)s" does not exist. The aliases are:: The authentication configuration file, authentication.conf
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The branch '%(branch)s' is not stacked. The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'. The branch '%(url)s'(%(format)s) is not a stackable format. You will need to upgrade the branch to permit branch stacking. The branch *MUST* be on a listable system such as local disk or sftp. The branch format %(format)s is already at the most recent format. The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH
is not supplied, the remembered submit branch will be used. If no submit
branch is remembered, the development focus will be used. The branch you intend to submit your current work to. This is automatically
set by ``bzr send``, and is also used by the ``submit:`` revision spec. This
should usually be set on a per-branch or per-location basis. The branch {0} has no revision {1}. The bug this branch fixes. The bug this proposal fixes. The bzr client (through the plugin called 'launchpad') has special
features to communicate with Launchpad: The class that contains each hook is given before the hooks it supplies. For
instance, BranchHooks as the class is the hooks class for
`bzrlib.branch.Branch.hooks`. The content being inserted is already present. The conversion between these formats is done by content filters.
A content filter has two parts: The correct resolution would be "Martin Pool released Bazaar." The default behaviour is to send the merge directive by mail, unless -o is
given, in which case it is sent to a file. The default format is ``long``. To change this, define the ``log_format``
setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say):: The default log format to use. Standard log formats are ``long``, ``short``
and ``line``. Additional formats may be provided by plugins. The default
value is ``long``. The definitions found in this file are used to find the credentials to use for
a given url. The same credentials can generally be used for as many branches as
possible by grouping their declaration around the remote servers that need
them. It's even possible to declare credentials that will be used by different
servers. The dirstate file (%(state)s) appears to be corrupt: %(msg)s The email address to use when committing a branch. Typically takes the form
of:: The examples below use ':' as the separator, windows users
should use ';'. The feature %(feature)s has already been registered. The file deletion mode to be used. The file id "%(file_id)s" is not present in the repository %(repository)r The file id "%(file_id)s" is not present in the tree %(tree)s. 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 following are not yet implemented but planned as parts of a work in
progress: The following markers can be used in the command-line to substitute filenames
involved in the merge conflict:: The general rules for :doc:`configuration files <configuration-help>`
apply except for the variable policies. The intent is to make this file as small as possible to minimize maintenance. The inventory was not in the expected format:
%(msg)s The key '%(key)s' is already in index '%(index)s'. The key '%(key)s' is not a valid key. The keywords used as revision selection methods are the following: The levels argument must be an integer. The limit argument must be an integer. The location that commits should go to when acting as a checkout.
This option is normally set by ``bind``. The lock for '%(lock_description)s' is in use and cannot be broken. The log file contains debug information that is useful for diagnosing or
reporting problems with Bazaar. The merge directives created by bzr send may be applied using bzr merge or
bzr pull by specifying a file containing a merge directive as the location. The method %(mname)s is not supported on objects of type %(tname)s. The newest format, 2a, is highly recommended. If your
project is not using 2a, then you should suggest to the
project owner to upgrade. The only valid section headers for bazaar.conf currently are [DEFAULT] and
[ALIASES]. Section headers are case sensitive. The default section provides for
setting options which can be overridden with the branch config file. 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 %(path)s is not permitted on this platform The path name in the old tree. The path of the editor that you wish to use if *bzr commit* is run without
a commit message. This setting is trumped by the environment variable
``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment
variables. The path to the branch to switch to can be specified relative to the parent
directory of the current branch. For example, if you are currently in a
checkout of /path/to/branch, specifying 'newbranch' will find a branch at
/path/to/newbranch. The path to the plugins directory that Bazaar should use.
If not set, Bazaar will search for plugins in: The path where Bazaar should look for shell plugin external commands. The prefix %(prefix)s is in the help search path twice. The relation between branch and tree. The repository '%(url)s'(%(format)s) is not a stackable format. You will need to upgrade the repository to permit branch stacking. The repository {0} contains no revision {1}. The result is a combined tree, with the subtree no longer an independent
part. This is marked as a merge of the subtree into the containing tree,
and all history is preserved. 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 section name is an arbitrary string, only the ``DEFAULT`` value is reserved
and should appear as the *last* section. The solution is to merge the revisions from the mainline into your local
branch. To do so, use ``bzr merge`` to get the new revisions from the
mainline. This merge may result in conflicts if the other developer's changes
overlap with your changes. These conflicts should be resolved before
continuing. After any conflicts have been resolved, or even if there were no
conflicts, Bazaar requires that you explicitly commit these new revisions
to your local branch. This requirement gives you an opportunity to test the
resulting working tree for correctness, since the merged revisions could have
made arbitrary changes. After testing, you should commit the merge using
``bzr commit``. This clears up the diverged branches situation. Your local
branch can now be pushed to the mainline.
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 specified command must accept the options "--clearsign" and "-u <email>". The specified commit message contains characters unsupported by the current encoding. The submit branch defaults to the parent of the source branch, but can be
overridden. Both submit branch and public branch will be remembered in
branch.conf the first time they are used for a particular branch. The
source branch defaults to that containing the working directory, but can
be changed using --from. The synonyms 'clone' and 'get' for this command are deprecated. The syntax of the file obeys the same rules as the others except for the
option policies which don't apply. The target branch will not have its working tree populated because this
is both expensive, and is not supported on remote file systems. The transport '%(transport)s' is only accessible within this process. The tree builder is already building a tree. 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 user aborted the operation. The value '%(value)s' is not a valid value. The variable specified a list of ``plugin_name@plugin path``,
``plugin_name`` being the name of the plugin as it appears in
python module paths, ``plugin_path`` being the path to the
directory containing the plugin code itself
(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list
separator, use ';' on windows. 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 contains a list of revisions that have been merged but
not yet committed. These revisions will be included as additional parents
of the next commit. Normally, using revert clears that list as well as
reverting the files. If any files are specified, revert leaves the list
of uncommitted merges alone and reverts only the files. Use ``bzr revert
.`` in the tree root to revert all files but keep the recorded merges,
and ``bzr revert --forget-merges`` to clear the pending merge list without
reverting any files. The working tree for %(basedir)s has changed since the last commit, but weave merge requires that it be unchanged There are a few characters which have special meaning in URLs and need careful
handling to avoid ambiguities. Characters can be escaped with a % and a hex
value in URLs. Any non-ASCII characters in a file path will automatically be
urlencoded when the path is converted to a URL. There are three primary configuration files in this location: There are two kinds of authentication used by the various schemes supported by
bzr: There are two possible values for this option: There is already a branch merge proposal: %s There is no public branch set for "%(branch_url)s". Therefore simply saying 'bzr add' will version all files that
are currently unknown. These are produced when a text merge cannot completely reconcile two sets of
text changes. Bazaar will emit files for each version with the extensions
THIS, OTHER, and BASE. THIS is the version of the file from the target tree,
i.e. the tree that you are merging changes into. OTHER is the version that you
are merging into the target. BASE is an older version that is used as a basis
for comparison. These are valid but do not refer to the same file:: These branches have diverged. See "bzr help diverged-branches" for more information. These branches have diverged. Try merging, and then bind again. These branches have diverged. Use the missing command to see how.
Use the merge command to reconcile them. These flags can be passed on the bzr command line or (without the ``-D``
prefix) put in the ``debug_flags`` variable in ``bazaar.conf``. These options apply only to branches that use the ``dirstate-tags`` or
later format. They
are usually set in ``.bzr/branch/branch.conf`` automatically, but may be
manually set in ``locations.conf`` or ``bazaar.conf``. These options may be used with any command, and may appear in front of any
command. (e.g. ``bzr --profile help``). 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 breaks a lock on a repository, branch, working directory or
config file. 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 generates a shell function which can be used by bash to
automatically complete the currently typed command when the user presses
the completion key (usually tab). This command lists a bzr branch in the directory of branches on
launchpad.net. Registration allows the branch to be associated with
bugs or specifications. 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 requires the target tree to be in a rich-root format. This command shows a table of tag names and the revisions they reference. This command will print the names of all the branches at the current
location. This command will produce a target tree in a format that supports
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
converted into earlier formats like 'dirstate-tags'. This command will show all known locations and formats associated to the
tree, branch or repository. This conflict happens when there are conflicting changes in the working tree
and the merge source, but the conflicted items are not text files. They may
be binary files, or symlinks, or directories. It can even happen with files
that are deleted on one side, and modified on the other. This does not sign commits that already have signatures. This happens when a directory has been deleted in the target, but has new
children in the source. This is similar to the "unversioned parent" conflict,
except that the parent directory does not *exist*, instead of just being
unversioned. In this situation, Bazaar will create the missing parent.
Resolving this issue depends very much on the particular scenario. This happens when one side has added files to a directory, and the other side
has changed the directory into a file or symlink. For example:: This happens when the source and target have each modified the name or parent
directory of a file. Bazaar will use the path elements from the source. This happens when the source and the target have each moved directories, so
that, if the change could be applied, a directory would be contained by itself.
For example:: This is a checkout. The branch (%s) needs to be upgraded separately. This is equal to the number of revisions on this branch. This is equivalent to creating the directory and then adding it. This is the opposite of "missing parent". A directory is deleted in the
source, but has new children in the target (either because a directory
deletion is merged or because the merge introduce new children). Bazaar
will retain the directory. Resolving this issue depends very much on the
particular scenario. 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 operation requires rich root data storage This prints out the given file with an annotation on the left side
indicating which revision, author and date introduced the change. This reports on versioned and unknown files, reporting them
grouped by state. Possible states are: This situation commonly arises when using a centralized workflow with local
commits. If someone else has committed new work to the mainline since your
last pull and you have local commits that have not yet been pushed to the
mainline, then your local branch and the mainline have diverged. This tree contains left-over files from a failed operation.
Please examine %(limbo_dir)s to see if it contains any files you wish to
keep, and delete it when you are done. This tree contains left-over files from a failed operation.
Please examine %(pending_deletion)s to see if it contains any files you
wish to keep, and delete it when you are done. This will afterwards rebase the local branch on the remote
branch unless the --no-rebase option is used, in which case
the two branches will be out of sync after the push. This will open your usual editor to provide the initial comment. When it
has created the proposal, it will open it in your default web browser. 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. This will propose a merge, request "jrandom" to perform a review of
unspecified type, and request "review-team" to perform a "qa" review. This will remove the branch from the specified location but
will keep any working tree or repository in place. Tip change rejected: %(msg)s To check what clean-tree will do, use --dry-run. To compare the working directory to a specific revision, pass a
single revision to the revision argument. To configure which files to filter, set ``eol`` to one of the values below.
(If a value is not set, ``exact`` is the default.) To create a shared repository use the init-repository command (or the alias
init-repo). This command takes the location of the repository to create. This
means that 'bzr init-repository repo' will create a directory named 'repo',
which contains a shared repository. Any new branches that are created in this
directory will then use it for storage. To disable the current view without deleting it, you can switch to
the pseudo view called ``off``. This can be useful when you need
to see the whole tree for an operation or two (e.g. merge) but
want to switch back to your view after that. To ensure that older clients do not access data incorrectly,
Bazaar's policy is to introduce a new storage format whenever
new features requiring new metadata are added. New storage
formats may also be introduced to improve performance and
scalability. To filter on a range of revisions, you can use the command -r begin..end
-r revision requests a specific revision, -r ..end or -r begin.. are
also valid.
:Exit values:
1 - some missing revisions
0 - no missing revisions To generalize, there are two content formats supported by Bazaar: 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 only some changes, without reverting to a prior version, use
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
will remove the changes introduced by the second last commit (-2), without
affecting the changes introduced by the last commit (-1). To remove
certain changes on a hunk-by-hunk basis, see the shelve command.
To update the branch to a specific revision or the latest revision and
update the working tree accordingly while preserving local changes, see the
update command. 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 rename a tag (change the name but keep it on the same revsion), run ``bzr
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``. To resolve that kind of conflict, you have to decide what name should be
retained for the file, directory or symlink involved. To resolve that kind of conflict, you just have to decide what name should be
retained for the file involved. To resolve that kind of conflict, you should either remove or rename the
children or the directory or a combination of both. To resolve that kind of conflict, you should rebuild FILE from either version
or a combination of both. To resolve the conflict, you must apply the correct tags to either the target
branch or the source branch as appropriate. Use "bzr tags --show-ids -d
SOURCE_URL" to see the tags in the source branch. If you want to make the
target branch's tags match the source branch, then in the target branch do
``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the
CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the source
branch. You need not call "bzr resolve" after doing this. To resolve in
favor of the target branch, you need to similarly use ``tag --force`` in the
source branch. (Note that pulling or pushing using --overwrite will overwrite
all tags as well.) 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". To take all schemes into account, the password will be deduced from a set of
authentication definitions (``scheme``, ``host``, ``port``, ``path``, ``user``,
``password``). To use a specific mail program, set the mail_client configuration option.
(For Thunderbird 1.5, this works around some bugs.) Supported values for
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
Mail.app), "mutt", and "thunderbird"; generic options are "default",
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
supported clients. To use this feature you must upgrade your branch at %(path)s to a format which supports rich roots. To use this feature you must upgrade your branch at %(path)s. To use this feature you must upgrade your repository at %(path)s. Too many redirections Too many redirections trying to make %s. Topics list Trailing slashes on patterns are ignored. If the pattern contains a
slash or is a regular expression, it is compared to the whole path
from the branch root. Otherwise, it is compared to only the last
component of the path. To match a file only in the root directory,
prepend ``./``. Patterns specifying absolute paths are not allowed. Transferring revisions Transport error: %(msg)s %(orig_error)s Transport operation not possible: %(msg)s %(orig_error)s TransportHooks
-------------- Tree is up to date at revision %d. Tree is up to date at revision {0} of branch {1} Tree type Trees in Repository Turn this branch into a mirror of another branch. Two formats are currently supported: "4" uses revision bundle format 4 and
merge directive format 2. It is significantly faster and smaller than
older formats. It is compatible with Bazaar 0.19 and later. It is the
default. "0.9" uses revision bundle format 0.9 and merge directive
format 1. It is compatible with Bazaar 0.12 - 0.18. Type of file to export to. Types of conflicts and what to do about them Typical message:: URL Identifiers URLs differ by more than path: %(from_)r and %(to)r URLs represent non-ASCII characters in an encoding defined by the server, but
usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to be
generous in what it accepts as a URL and to print them in a way that
will be readable. Unable to connect to current master branch %(target)s: %(error)s To switch anyway, use --force. Unable to connect to target of bound branch %(branch)s => %(target)s: %(error)s Unable to create symlink %(path_str)son this platform Unable to delete transform temporary directory %(limbo_dir)s.
Please examine %(limbo_dir)s to see if it contains any files you wish to
keep, and delete it when you are done. Unable to delete transform temporary directory %(pending_deletion)s. Please examine %(pending_deletion)s to see if it contains any files you wish to keep, and delete it when you are done. Unable to determine your name.
Please, set your name with the 'whoami' command.
E.g. bzr whoami "Your Name <name@example.com>" Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s Unable to find mail client with the following names: %(mail_command_list_string)s Unable to handle bundle version %(version)s: %(msg)s Unable to import library "%(library)s": %(error)s Unable to import paramiko (required for sftp support): %(error)s Unable to obtain Uncommit leaves the working tree ready for a new commit. The only change
it may make is to restore any pending merges that were present before
the commit. Uncommit these revisions Uncommitted changes to files that are reverted will be discarded.
Howver, by default, any files that have been manually changed will be
backed up first. (Files changed only by merge are not backed up.) Backup
files have '.~#~' appended to their name, where # is a number. Under special circumstances (mostly when trying to diagnose a
bug), it's better to disable a plugin (or several) rather than
uninstalling them completely. Such plugins can be specified in
the ``BZR_DISABLE_PLUGINS`` environment variable. Unexpected end of container stream Unknown %(kind)s format: %(format)r Unknown key {0} signed {1} commit Unknown key {0} signed {1} commits Unknown record type: %(record_type)r Unknown rules detected: %(unknowns_str)s. Unlike global options, standard options can be used in aliases.
Unrecognised container format: %(container_format)r Unrecognised value for BZR_SSH environment variable: %(vendor)s Unrecognized bug %s. Commit refused. Unstacking Unsupported branch format: %(format)s
Please run 'bzr upgrade' Unsupported entry kind %(kind)s Unsupported export format: %s Unsupported protocol for url "%(path)s"%(extra)s Unsupported timezone format "%(timezone)s", options are "utc", "original", "local". Unversioned parent
------------------ Update a mirror of this branch. Update a working tree to a new revision. Updated tag %s. Updated to revision %d. Updated to revision {0} of branch {1} Upgrade URL cannot work with readonly URLs. Upgrade a repository, branch or working tree to a newer format. Upgrade to a specific format. See "bzr help formats" for details. Upgrading %s Upgrading branch Upgrading bzrdirs Upgrading repository Upgrading working tree Upgrading {0} {1} ... Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2. Use an ASCII NUL (\0) separator rather than a newline. Use bzr resolve when you have fixed a problem. Use bzr resolve when you have fixed a problem. See also bzr conflicts. Use short status indicators. Use specified log format. Use the specified output format. 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. Useful commands:: User and password to authenticate to the SMTP server. If smtp_username
is set, and smtp_password is not, Bazaar will prompt for a password.
These settings are only needed if the SMTP server requires authentication
to send mail. Using "bzr revert --forget-merges", it is possible to apply all of the
changes from a branch in a single revision. To do this, perform the merge
as desired. Then doing revert with the "--forget-merges" option will keep
the content of the tree as it was, but it will clear the list of pending
merges. The next commit will then contain all of the changes that are
present in the other branch, but without any other parent revisions.
Because this technique forgets where these changes originated, it may
cause additional conflicts on later merges involving the same source and
target branches. Using '{0}' view: {1}
Using Bazaar with Launchpad.net Using ``relpath`` to achieve the same result is done like this:: Using a specific version of ``myplugin``:
``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin`` Using changes with id "%d". Using default stacking branch {0} at {1} Using saved location: %s
Using saved parent location: %s
Using saved parent location: {0}
Using saved push location: %s Using saved {0} location "{1}" to determine what changes to submit. Using shared repository: %s
Using {0} {1} VFS requests over the smart server are not allowed. Encountered: %(method)s, %(arguments)s. Valid values: Validate working tree structure, branch consistency and repository history. Variable {%(name)s} is not available. Various actions are available depending on the kind of conflict, for some of
these actions, Bazaar can provide some help. In the end you should at least
inform Bazaar that you're done with the conflict with:: Verifies that all commits in the branch are signed by known GnuPG keys. Verify all commit signatures. Version info in Custom template-based format. Version info in Python format. Version info in RIO (simple text) format (default). Versioned file error Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree to a later format. Views defined:
Views provide a mask over the tree so that users can focus on
a subset of a tree when doing their work. After creating a view,
commands that support a list of files - status, diff, commit, etc -
effectively have that list of files implicitly given each time.
An explicit list of files can still be given but those files
must be within the current view. Waiting for %d client(s) to finish Walking content 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.
Weave invariant violated: %(what)s Weave-based merge. Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, %(weave_b)s What names to list as authors - first, all or committer. Whatever the conflict is, resolving it is roughly done in two steps: When Bazaar generates a conflict, it adds information into the working tree to
present the conflicting versions, and it's up to you to find the correct
resolution. When Bazaar tries to push one branch onto another, it requires that the
destination branch must be ready to receive the source branch. If this isn't
the case, then we say that the branches have ``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. To recover
from diverged branches, one must merge the missing revisions into the source
branch. When adding a new feature or working on a bug in a plugin,
developers often need to use a specific version of a given
plugin. Since python requires that the directory containing the
code is named like the plugin itself this make it impossible to
use arbitrary directory names (using a two-level directory scheme
is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even
if they don't appear in ``BZR_PLUGIN_PATH`` . When an option is local to a Section, it cannot be referred to from option
values in any other section from the same ``Store`` nor from any other
``Store``. When committing to a foreign version control system do not push data that can not be natively represented. When communicating with Launchpad, some commands need to know your
Launchpad user ID. This command can be used to set or show the
user ID that Bazaar will use for such communication. When conflicts are present in your working tree (as shown by ``bzr
conflicts``), you should resolve them and then inform bzr that the conflicts
have been resolved. When making a commit, metadata about bugs fixed by that change can be
recorded by using the ``--fixes`` option. For each bug marked as fixed, an
entry is included in the 'bugs' revision property stating '<url> <status>'.
(The only ``status`` value currently supported is ``fixed.``) 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 pulling from or pushing to another branch, Bazaar informs you about tags
that conflict between the two branches; that is the same tag points to two
different revisions. You need not resolve these conflicts, but subsequent
uses of pull or push will result in the same message. When reconfiguring a checkout, tree or branch into a lightweight checkout,
a local branch must be destroyed. (For checkouts, this is the local branch
that serves primarily as a cache.) If the branch-to-be-destroyed does not
have the same last revision as the new reference branch for the lightweight
checkout, data could be lost, so Bazaar refuses. When the conflict is resolved, Bazaar deletes the previously generated
``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the
working tree. 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 two branches of the same project share a repository, there is
generally a large space saving. For some operations (e.g. branching
within the repository) this translates in to a large time saving. When used in a directory like
``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get:: When used with a colocated branch named ``832013-expand-in-stack``, we'll get:: When you have resolved text conflicts, just run ``bzr resolve --auto``, and
Bazaar will auto-detect which conflicts you have resolved. 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. When you push a branch to a remote system, a working tree will not be
created. If one is already present the files will not be updated. The
branch information will be updated and the working tree will be marked
as out-of-date. Updating a working tree remotely is difficult, as there
may be uncommitted changes or the update may cause content conflicts that are
difficult to deal with remotely. Whether new branches in the repository have trees. While most configuration is handled by configuration files, some options
which may be semi-permanent can also be controlled through the environment. Will continue to try until %s, unless you press Ctrl-C. With this configuration, the push location for ``/top/location/branch1``
would be ``sftp://example.com/location/branch1``. Working Trees Working tree "%(display_url)s" has shelved changes (See bzr shelve --list).%(more)s Working tree "%(display_url)s" has uncommitted changes (See bzr status).%(more)s Working tree has conflicts. Working tree is out of date, please run 'bzr update'.%(more)s WorkingSize %8d KiB WorkingSize {0:>7}KiB PeakWorking {1:>7}KiB {2} Write converters are only applied by commands that **create files in a
working tree**, e.g. branch, checkout, update. If you wish to see the
canonical format of a file or tree, use ``bzr cat`` or ``bzr export``
respectively. Write merge directive to this file or directory; use - for stdout. Write the contents of a file as of a given revision to standard output. Writing weave Yet, whether Bazaar makes a choice or not, there are some other simple but
different ways to resolve the conflict. You are missing %d revision:
You are missing %d revisions:
You can change the master of a checkout by using the "switch" command (see
"help switch"). This will change the location that the commits are sent to.
The "bind" command can also be used to turn a normal branch into a heavy
checkout. If you would like to convert your heavy checkout into a normal
branch so that every commit is local, you can use the "unbind" command. To see
whether or not a branch is bound or not you can use the "info" command. If the
branch is bound it will tell you the location of the bound branch. You can get information on what locks are open via the 'bzr info
[location]' command. You can handle text conflicts either by editing the main copy of the file,
or by invoking external tools on the THIS, OTHER and BASE versions. It's
worth mentioning that resolving text conflicts rarely involves picking one
set of changes over the other (but see below when you encounter these
cases). More often, the two sets of changes must be intelligently combined. You can only supply one of revision_id or --revision You can put multiple items on the shelf, and by default, 'unshelve' will
restore the most recently shelved changes. You can restore the old tip by running:
bzr pull . -r revid:%s
You can use this command to add information about version into
source code of an application. The output can be in one of the
supported formats or in a custom format based on a template. 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 have %d extra revision:
You have %d extra revisions:
You must supply either --revision or a revision_id You must supply either a revision or a location Your branch does not have all of the revisions required in order to merge this merge directive and the target location specified in the merge directive is not a branch: %(location)s. Your local commits will now show as pending merges with 'bzr status', and can be committed with 'bzr commit'. _ConfigHooks
------------ _`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3) ``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``
``SFTP`` can use either a password or a host key to authenticate. However,
ssh agents are a better, more secure solution. So we have chosen to not provide
our own less secure method. ``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly
specifying the appropriate port. ``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate
against a host. But, by using ``.htaccess`` files, for example, it is possible
to define several (``user, realm, password``) for a given ``host``. So what is
really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` is
not taken into account in the definitions, but will displayed if bzr prompts
you for a password. ``authentication.conf`` allows one to specify credentials for
remote servers. This can be used for all the supported transports and any part
of bzr that requires authentication (smtp for example). ``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.
The default section contains the default
configuration options for all branches. The default section can be
overriden by providing a branch-specific section in ``locations.conf``. ``bzr resolve`` recognizes the following actions: ``locations.conf`` allows one to specify overriding settings for
a specific branch. The format is almost identical to the default section in
bazaar.conf with one significant change: The section header, instead of saying
default, will be the path to a branch that you wish to override a value
for. The '?' and '*' wildcards are supported:: `bzr send` creates a compact data set that, when applied using bzr
merge, has the same effect as merging from the source branch. action add Add specified files or directories.
alias Set/unset and display aliases.
annotate Show the origin of each line in a file.
bash-completion Generate a shell function for bash command line completion.
[bash_completion]
bind Convert the current branch into a checkout of the supplied
branch.
branch Create a new branch that is a copy of an existing branch.
branches List the branches available at the current location.
break-lock Break a dead lock.
cat Write the contents of a file as of a given revision to
standard output.
check Validate working tree structure, branch consistency and
repository history.
checkout Create a new checkout of an existing branch.
clean-tree Remove unwanted files from working tree.
commit Commit changes into a new revision.
config Display, set or remove a configuration option.
conflicts List files with conflicts.
deleted List files deleted in the working tree.
diff Show differences in the working tree, between revisions or
branches.
dpush Push into a different VCS without any custom bzr metadata.
export Export current or past revision to a destination directory or
archive.
help Show help on a command or other topic.
ignore Ignore specified files or patterns.
ignored List ignored files and the patterns that matched them.
info Show information about a working tree, branch or repository.
init Make a directory into a versioned branch.
init-repository Create a shared repository for branches to share storage
space.
join Combine a tree into its containing tree.
launchpad-login Show or set the Launchpad user ID. [launchpad]
launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]
launchpad-open Open a Launchpad branch page in your web browser. [launchpad]
log Show historical log for a branch or subset of a branch.
lp-find-proposal Find the proposal to merge this revision. [launchpad]
lp-propose-merge Propose merging a branch on Launchpad. [launchpad]
ls List files in a tree.
merge Perform a three-way merge.
missing Show unmerged/unpulled revisions between two branches.
mkdir Create a new versioned directory.
mv Move or rename a file.
nick Print or set the branch nickname.
pack Compress the data within a repository.
plugins List the installed plugins.
pull Turn this branch into a mirror of another branch.
push Update a mirror of this branch.
reconcile Reconcile bzr metadata in a branch.
reconfigure Reconfigure the type of a bzr directory.
register-branch Register a branch with launchpad.net. [launchpad]
remerge Redo a merge.
remove Remove files or directories.
remove-branch Remove a branch.
remove-tree Remove the working tree from a given branch/checkout.
renames Show list of renamed files.
resolve Mark a conflict as resolved.
revert Set files in the working tree back to the contents of a
previous revision.
revno Show current revision number.
root Show the tree root directory.
send Mail or create a merge-directive for submitting changes.
serve Run the bzr server.
shelve Temporarily set aside some changes from the current tree.
sign-my-commits Sign all commits by a given committer.
split Split a subdirectory of a tree into a separate tree.
status Display status summary.
switch Set the branch of a checkout and update.
tag Create, remove or modify a tag naming a revision.
tags List tags.
testament Show testament (signing-form) of a revision.
unbind Convert the current checkout into a regular branch.
uncommit Remove the last committed revision.
unshelve Restore shelved changes.
update Update a working tree to a new revision.
upgrade Upgrade a repository, branch or working tree to a newer
format.
verify-signatures Verify all commit signatures.
version Show version of bzr.
version-info Show version information about this tree.
view Manage filtered views.
whoami Show or set bzr user id.
add.maximum_file_size
~~~~~~~~~~~~~~~~~~~~~ added added
Versioned in the working copy but not in the previous revision. added List files added in working tree.
ancestry List all revisions merged into this branch.
assert-fail Test reporting of assertion failures
bundle-info Output interesting stats about a bundle
bundle-revisions Create a merge-directive for submitting changes.
cat-revision Write out metadata for a revision.
dump-btree Dump the contents of a btree index file to stdout.
export-pot Export command helps and error messages in po format.
file-id Print file_id of a particular file or directory.
file-path Print path of file_ids to a file or directory.
find-merge-base Find and print a base revision for merging two branches.
hooks Show hooks.
inventory Show inventory of the current working copy or a revision.
local-time-offset Show the offset in seconds from GMT to local time.
lookup-revision Lookup the revision-id from a revision-number
merge-directive Generate a merge directive for auto-merge tools.
modified List files modified in working tree.
re-sign Create a digital signature for an existing revision.
reference list, view and set branch locations for nested trees.
relpath Show path of a file relative to root
repair-workingtree Reset the working tree state file.
revision-history Display the list of revision ids on a branch.
revision-info Show revision number and revision id for a given revision
identifier.
rocks Statement of optimism.
selftest Run internal test suite.
shell-complete Show appropriate completions for context.
test-script Run a shell-like test from a file.
touching-revisions Return revision-ids which affected a particular file.
unknowns List unknown files.
wait-until-signalled Test helper for
test_start_and_stop_bzr_subprocess_send_signal.
added %s
adding file adding prefixes to %s allowing URLs such as:: always
Sign every new revision that is committed. If the signing fails then the
commit will not be made. annotating append_revisions_only
~~~~~~~~~~~~~~~~~~~~~ arguments:
public_url: The publicly visible url for the branch to register.
This must be an http or https url (which Launchpad can read
from to access the branch). Local file urls, SFTP urls, and
bzr+ssh urls will not work.
If no public_url is provided, bzr will use the configured
public_url if there is one for the current branch, and
otherwise error. authentication Information on configuring authentication
basic Basic commands
branches Information on what a branch is
bugs Bug tracker settings
checkouts Information on what a checkout is
commands Basic help for all commands
configuration Details on the configuration settings available
conflict-types Types of conflicts and what to do about them
content-filters Conversion of content into/from working trees
criss-cross Information on criss-cross merging
current-formats Current storage formats
debug-flags Options to show or record debug information
diverged-branches How to fix diverged branches
env-variables Environment variable names and values
eol Information on end-of-line handling
files Information on configuration and log files
formats Information on choosing a storage format
global-options Options that control how Bazaar runs
hidden-commands All hidden commands
hooks Points at which custom processing can be added
launchpad Using Bazaar with Launchpad.net
location-alias Aliases for remembered locations
log-formats Details on the logging formats available
other-formats Experimental and deprecated storage formats
patterns Information on the pattern syntax
repositories Basic information on shared repositories.
revisionspec Explain how to use --revision
rules Information on defining rule-based preferences
standalone-trees Information on what a standalone tree is
standard-options Options that can be used with any command
status-flags Help on status flags
sync-for-reconfigure Steps to resolve "out-of-sync" when reconfiguring
topics Topics list
url-special-chars Special character handling in URLs
urlspec Supported transport protocols
working-trees Information on working trees
automatic_tag_name
~~~~~~~~~~~~~~~~~~ bound
~~~~~ bound_location
~~~~~~~~~~~~~~ branch has no revision %s
bzr update --revision only works for a revision in the branch history bugtracker_<tracker>_url
------------------------ bugzilla_<tracker>_url
---------------------- 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 merge-directive takes at most two one revision identifiers bzr send makes extensive use of public locations to map local locations into
URLs that can be used by other people. See `bzr help configuration` to
set them, and use `bzr info` to display them. bzr send takes at most two one revision identifiers 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 bzr version-info --revision takes exactly one revision specifier bzr.default_mergetool
~~~~~~~~~~~~~~~~~~~~~ bzr.mergetool.<name>
~~~~~~~~~~~~~~~~~~~~ bzr: ERROR (ignored): %s bzr_remote_path
~~~~~~~~~~~~~~~ call
~~~~ can not move root of branch cannot create branch without source branch cannot specify both --from-root and PATH cannot upgrade from bzrdir format %s check check-available
(default) If gnupg signatures for revisions are present, check them.
Bazaar will fail if it finds a bad signature, but will not fail if
no signature is present. check_signatures
~~~~~~~~~~~~~~~~ checked branch {0} format {1} checked repository {0} format {1} checking branches and trees checking commit contents checking file graphs checking revisions checking text graph command {0!r} needs one or more {1} command {0!r} requires argument {1} commit_message_template
~~~~~~~~~~~~~~~~~~~~~~~ committers:
%s
converting revision create_signatures
~~~~~~~~~~~~~~~~~ debug_flags
~~~~~~~~~~~ default_format
~~~~~~~~~~~~~~ deleted %s deleting paths: development focus %s has no branch. dirstate.fdatasync
~~~~~~~~~~~~~~~~~~ dpush_strict
~~~~~~~~~~~~ editor
~~~~~~ email
~~~~~ error removing pending lock: %s example:
bzr register-branch http://foo.com/bzr/fooproject.mine \
--project fooproject extend_command
~~~~~~~~~~~~~~ extra argument to command {0}: {1} failed to clean-up {0}: {1} failed to reset the tree state{0} false
This section only applies to the branch at this directory and not
branches below it. finished fixes bug fixes bugs format found error:%s get
~~~ get_command
~~~~~~~~~~~ get_missing_command
~~~~~~~~~~~~~~~~~~~ gpg_signing_command
~~~~~~~~~~~~~~~~~~~ gpg_signing_key
~~~~~~~~~~~~~~~ held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s ignore
Do not check gnupg signatures of revisions. ignore requires at least one NAME_PATTERN or --default-rules. ignored {0} matching "{1}"
invalid direction %r invalid kind %r specified invalid kind specified inventories inventory kind changed
File kind has been changed (e.g. from file to directory). list_commands
~~~~~~~~~~~~~ listening on port: %s listening socket error: %s load
~~~~ loading revision loading text store lock_acquired
~~~~~~~~~~~~~ lock_broken
~~~~~~~~~~~ lock_released
~~~~~~~~~~~~~ locks.steal_dead
~~~~~~~~~~~~~~~~ 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:: log_format
~~~~~~~~~~ lstat/stat of ({0!r}): {1!r} mail_client
~~~~~~~~~~~ making backup of {0}
to {1} 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. merge_file_content
~~~~~~~~~~~~~~~~~~ merge_request_body
~~~~~~~~~~~~~~~~~~ merger: missing %s missing file argument modified modified
Text has changed since the previous revision. never
Reserved for future use. nicks: %s
not a valid revision-number: %r note: upgrade may be faster if all store files are ungzipped first open
~~~~ or:: output_encoding
~~~~~~~~~~~~~~~ parent_location
~~~~~~~~~~~~~~~ pb parameter to convert() is deprecated please specify a commit message with either --message or --file please specify either --message or --file post_branch_init
~~~~~~~~~~~~~~~~ post_build_tree
~~~~~~~~~~~~~~~ post_change_branch_tip
~~~~~~~~~~~~~~~~~~~~~~ post_command
~~~~~~~~~~~~ post_commit
~~~~~~~~~~~ post_connect
~~~~~~~~~~~~ post_merge
~~~~~~~~~~ post_pull
~~~~~~~~~ post_push
~~~~~~~~~ post_repo_init
~~~~~~~~~~~~~~ post_status
~~~~~~~~~~~ post_switch
~~~~~~~~~~~ post_transform
~~~~~~~~~~~~~~ post_uncommit
~~~~~~~~~~~~~ pre_change_branch_tip
~~~~~~~~~~~~~~~~~~~~~ pre_command
~~~~~~~~~~~ pre_commit
~~~~~~~~~~ pre_merge
~~~~~~~~~ pre_open
~~~~~~~~ pre_status
~~~~~~~~~~ pre_transform
~~~~~~~~~~~~~ protocol provided you have created the following ``authentication.conf`` file:: public_branch
~~~~~~~~~~~~~ push_location
~~~~~~~~~~~~~ push_strict
~~~~~~~~~~~ python-gpgme is not installed, it is needed to verify signatures recurse
~~~~~~~ register-branch requires a public branch url - see bzr help register-branch. remove
~~~~~~ removed
Versioned in the previous revision but removed or deleted
in the working copy. removing file renamed renamed
Path of this file changed from the previous revision;
the text may also have changed. This includes files whose
parent directory was renamed. renamed {0} to {1} 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. repository
~~~~~~~~~~ repository converted repository.fdatasync
~~~~~~~~~~~~~~~~~~~~ require
The gnupg signature for revisions must be present and must be valid. resolution for {0}
local: {1}
remote: {2} revision
~~~~~~~~ revision {%s} not present in branch; will be converted as a ghost revision_history ok. revisions
This is just the number of revisions checked. It doesn't
indicate a problem. save
~~~~ send_strict
~~~~~~~~~~~ server_exception
~~~~~~~~~~~~~~~~ server_started
~~~~~~~~~~~~~~ server_started_ex
~~~~~~~~~~~~~~~~~ server_stopped
~~~~~~~~~~~~~~ set
~~~ set_commit_message
~~~~~~~~~~~~~~~~~~ skipping {0} (larger than {1} of {2} bytes) smtp_server
~~~~~~~~~~~ smtp_username, smtp_password
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sorry, %r not allowed in path source package %s has no branch. start_commit
~~~~~~~~~~~~ starting repository conversion starting upgrade from format 4 to 5 starting upgrade from format 5 to 6 starting upgrade from format 6 to metadir starting upgrade of %s submit_branch
~~~~~~~~~~~~~ subunit not available. subunit needs to be installed to use --subunit. suppress_warnings
~~~~~~~~~~~~~~~~~ texts to mv multiple files the destination must be a versioned directory trac_<tracker>_url
------------------ transform_fallback_location
~~~~~~~~~~~~~~~~~~~~~~~~~~~ true
(default) This section applies to subdirectories as well. unable to remove "{0}": {1}. unable to remove %s unchanged unique file texts
This is the total number of unique file contents
seen in the checked revisions. It does not indicate a problem. unique files: %d
unknown
Not versioned and not matching an ignore pattern. unknown command "%s" unknown log formatter: %r 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. unreferenced version: {{{0}}} in {1} upgraded to weaves: versionedfiles
This is just the number of versionedfiles checked. It
doesn't indicate a problem. when-required
Reserved for future use. where "<tracker>" is an identifier for the bug tracker, and "<id>" is the
identifier for that bug within the bugtracker, usually the bug number.
If "<tracker>" is not specified the ``bugtracker`` set in the branch
or global configuration is used. where @new_path is replaced with the path of the new version of the
file and @old_path is replaced with the path of the old version of
the file. The PROGRAM should save the new file with the desired
contents of the file in the working tree.
where the columns' meanings are as follows. will produce a C header file with formatted string containing the
current revision number. Other supported variables in templates are: would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's
RT bug tracker as fixed, or:: would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-1234
in Hudson's JIRA bug tracker as fixed.
would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's
Roundup bug tracker as fixed, or:: would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as
fixed. would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 as
fixed. would refer to ``/home/remote/myproject/trunk``. write revision writer writing weave you simply use:: {0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use regular push. {0!r} is not present in revision {1} {0!r} was {1} locked again {0} => {1} {0} [{1}] - Stage {0} and {1} are mutually exclusive {0} commit by author {1} {0} commits by author {1} {0} commit by author {1} with key {2} now expired {0} commits by author {1} with key {2} now expired {0} commit not signed {0} commits not signed {0} commit not valid {0} commits not valid {0} commit with key now expired {0} commits with key now expired {0} commit with unknown key {0} commits with unknown keys {0} commits with valid signatures {0} conflict resolved, {1} remaining {0} conflicts resolved, {1} remaining {0} is not an SI unit. {0} is now stacked on {1}
{0} is{1} redirected to {2} {0} lock {1} {2}. {0} remembered {1} location {2} {0} signed {1} commit {0} signed {1} commits {0}: {1} ({2} multiparent)
Project-Id-Version: bzr
Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>
POT-Creation-Date: 2012-07-10 11:35+0200
PO-Revision-Date: 2012-07-20 14:35+0000
Last-Translator: Rafael Neri <Unknown>
Language-Team: English (Australia) <en_AU@li.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Plural-Forms: nplurals=2; plural=n != 1;
X-Launchpad-Export-Date: 2012-07-21 04:30+0000
X-Generator: Launchpad (build 15654)
.. note::
BZR_PLUGIN_PATH
~~~~~~~~~~~~~~~
Branch type specific options
----------------------------
BranchHooks
-----------
Common options
--------------
Configuration files
-------------------
Deprecated formats are shown below.
Enabling content filters
------------------------
Examples
--------
Format conversion
-----------------
Hooks
=====
Impact on commands
------------------
Intent
------
Personal projects hosted outside
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Planned enhancements
--------------------
Refreshing your working tree
----------------------------
SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed
Section options
^^^^^^^^^^^^^^^
See :doc:`formats-help` for more about storage formats.
Source hosting provider
~~~~~~~~~~~~~~~~~~~~~~~
The branch location configuration file, locations.conf
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The main configuration file, bazaar.conf
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
To commit to master branch, run update and then commit.
You can also pass --local to commit to continue working disconnected.
Unicode options
---------------
When you want to pick one set of changes over the other, you can use ``bzr
resolve`` with one of the following actions:
http_proxy, https_proxy
~~~~~~~~~~~~~~~~~~~~~~~ # Pet projects on hobby.net
[hobby]
host=r.hobby.net
user=jim
password=obvious1234
# Home server
[home]
scheme=https
host=home.net
user=joe
password=1essobV10us
[DEFAULT]
# Our local user is barbaz, on all remote sites we're known as foobar
user=foobar # development branches on dev server
[dev]
scheme=ssh # bzr+ssh and sftp are available here
host=dev.company.com
path=/dev/integration
user=user2
# proxy
[proxy]
scheme=http
host=proxy.company.com
port=3128
user=proxyuser1
password=proxypass1 [reference code]
scheme=https
host=dev.company.com
path=/dev
user=user1
password=pass1 [shpnet domain]
# we use sftp, but ssh is the scheme used for authentication
scheme=ssh
# The leading '.' ensures that 'shp.net' alone doesn't match
host=.shp.net
user=joe
# bzr don't support supplying a password for sftp,
# consider using an ssh agent if you don't want to supply
# a password interactively. (pageant, ssh-agent, etc) 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" top-level 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 log -r date:yesterday.. 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 {0} has wrong parents in index: {1!r} should be {2!r} $ bzr diff -r submit: %s should be in the ancestry for: * {0} version {1} has parents {2!r} but should have {3!r} ancestor:/path/to/branch
$ bzr diff -r ancestor:../../mainline/branch before:1913 -> Return the parent of revno 1913 (revno 1912)
before:revid:aaaa@bbbb-1234567890 -> return the parent of revision
aaaa@bbbb-1234567890
bzr diff -r before:1913..1913
-> Find the changes between revision 1913 and its parent (1912).
(What changes did revision 1913 introduce).
This is equivalent to: bzr diff -c 1913 branch:/path/to/branch bzr launchpad-login bzr launchpad-login bob date:yesterday -> select the first revision since yesterday
date:2006-08-14,17:10:14 -> select the first revision after
August 14th, 2006 at 5:10pm. last:1 -> return the last revision
last:3 -> return the revision 2 before the end.
revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789' revno:1 -> return the first revision of this branch
revno:3:/path/to/branch -> return the 3rd revision of
the branch '/path/to/branch'
revno:-1 -> The last revision in a branch.
-2:http://other/branch -> The second to last revision in the
remote branch.
-1000000 -> Most likely the first revision, unless
your history is very long. * The 'lp:' bug tracker alias can expand launchpad bug numbers to their
URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes lp:12345'
will record a revision property that marks that revision as fixing
Launchpad bug 12345. When you push that branch to Launchpad it will
automatically be linked to the bug report. * The 'lp:' transport uses Launchpad as a directory service: for example
'lp:bzr' and 'lp:python' refer to the main branches of the relevant
projects and may be branched, logged, etc. You can also use the 'lp:'
transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk. * The launchpad-login command tells Bazaar your Launchpad user name. This
is then used by the 'lp:' transport to download your branches using
bzr+ssh://. * The register-branch command tells Launchpad about the url of a
public branch. Launchpad will then mirror the branch, display
its contents and allow it to be attached to bugs and other
objects. -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":: <no hooks installed>
Check everything at 'baz':: Check only the repository at 'bar':: Check the tree and branch at 'foo':: Conflict because FILE is not versioned, but has versioned children. Determine the missing revisions between this and another branch:: Determine the missing revisions between this and the branch at the
remembered pull location:: Determine the missing revisions up to a specific revision on the other
branch:: Determine the missing revisions up to a specific revision on this
branch:: 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:: Diffing against this shows all the changes that were made in this branch,
and is a good predictor of what merge will do. The submit branch is
used by the bundle and merge directive commands. If no submit branch
is specified, the parent branch is used instead. Examples:: Ignore .class files in all directories...:: Ignore .o files under the lib directory:: Ignore everything but the "debian" top-level directory:: Ignore files whose name begins with the "#" character:: It is an error to request the parent of the null revision (before:0). 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:: One way to display all the changes since yesterday would be:: 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/:: Select the revision that last modified the specified line. Line is
specified as path:number. Path is a relative path to the file. Numbers
start at 1, and are relative to the current version, not the last-
committed version of the file. Select the revision that merged the specified revision into mainline. 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:: Supply a datestamp to select the first revision that matches the date.
Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
Matches the first entry after a given date (either at midnight or
at a specified time). Supply a positive number to get the nth revision from the end.
This is the same as supplying negative numbers to the 'revno:' spec.
Examples:: Supply a specific revision id, that can be used to specify any
revision id in the ancestry of the branch.
Including merges, and pending merges.
Examples:: Supply any revision spec to return the parent of that revision. This is
mostly useful when inspecting revisions that are not in the revision history
of a branch. Supply the path to a branch to select its last revision. Supply the path to a branch to select the common ancestor. Tags are stored in the branch and created by the 'tag' command. 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):: The common ancestor is the last revision that existed in both
branches. Usually this is the branch point, but it could also be
a revision that was merged. This is frequently used with 'diff' to return all of the changes
that your branch introduces, while excluding the changes that you
have not merged from the remote branch. 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 Use an integer to specify a revision in the history of the branch.
Optionally a branch can be specified. A negative number will count
from the end of the branch (-1 is the last revision, -2 the previous
one). If the negative number is larger than the branch's history, the
first revision is returned.
Examples:: [/home/jdoe/branches/nethack]
email = Nethack Admin <nethack@nethack.com> [ALIASES]
tip = log -r-1
top = log -l10 --line
show = log -v -p [DEFAULT] [DEFAULT]
email = John Doe <jdoe@isp.com>
editor = /usr/bin/vim
create_signatures = when-required [http://hypothetical.site.com/branches/devel-branch]
create_signatures = always [http://mybranches.isp.com/~jdoe/branchdir]
[/home/jdoe/branches/] [name *.bat]
eol = native [name *.html *.xml]
keywords = xml_escape bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id} bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id} bugtracker_python_url = http://bugs.python.org/issue{id} bugzilla_squid_url = http://bugs.squid-cache.org bzr commit --fixes <id> bzr commit --fixes <tracker>:<id> bzr commit foo -x foo/bar bzr info bzr info -v bzr info -vv bzr ls --ignored bzr mv SOURCE... DESTINATION bzr push :parent
bzr remove-branch repo/trunk bzr view bzr view --all bzr view --delete bzr view --delete --all bzr view --name view-name bzr view --name view-name --delete bzr view --name view-name file1 dir1 ... bzr view --switch off bzr view --switch view-name bzr view file1 dir1 ... cd ~/project
bzr init
bzr add .
bzr status
bzr commit -m "imported project" change_editor = PROGRAM @new_path @old_path debug_flags = hpss debug_flags = hpss,evil email = John Doe <jdoe@isp.com>
gpg_signing_key = Amy Pond <amy@example.com> email = Full Name <account@hostname.tld> gpg_signing_command = /usr/bin/gnpg my_branch_name = feature_x
my_server = bzr+ssh://example.com
push_location = {my_server}/project/{my_branch_name} trac_twisted_url = http://www.twistedmatrix.com/trac $ bzr config mypush
lp:~vila/bzr/832013-expand-in-stack Patterns containing square brackets or spaces should be
surrounded in quotes to ensure they are correctly parsed.
Some of the older formats have two variants:
a plain one and a rich-root one. The latter include an additional
field about the root of the tree. There is no performance cost
for using a rich-root format but you cannot easily merge changes
from a rich-root format into a plain format. As a consequence,
moving a project to a rich-root format takes some co-ordination
in that all contributors need to upgrade their repositories
around the same time. 2a and all future formats will be
implicitly rich-root. ``bzr resolve FILE`` xxx <filename> "John Doe <jdoe@example.com>" $ bzr init
$ bzr mkdir foo
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ rmdir foo
$ touch foo
$ bzr commit -m "THIS"
$ bzr mkdir ../other/foo/bar
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other $ bzr init
$ bzr mkdir white
$ bzr mkdir black
$ bzr commit -m "BASE"
$ bzr branch . ../other
$ bzr mv white black
$ bzr commit -m "THIS"
$ bzr mv ../other/black ../other/white
$ bzr commit ../other -m "OTHER"
$ bzr merge ../other * The connection is via a smart server (accessed with a URL starting with
"bzr://", "bzr+ssh://" or "bzr+http://", or accessed via a "http://"
URL when a smart server is available via HTTP). * The execute bit was changed
* The hook is either server specific or part of general infrastructure rather
than client specific code (such as commit). * ``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 * ``host``: can be empty (to act as a default for any host), * ``password``: can be empty if you prefer to always be prompted for your
password. * ``path``: can be empty (FTP or SFTP will never user it), * ``port`` can be empty (useful when an host provides several servers for the
same scheme), only numerical values are allowed, this should be used only
when the server uses a port different than the scheme standard port, * ``scheme``: can be empty (meaning the rest of the definition can be used
for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, ``ssh``
should be used instead since this is the real scheme regarding
authentication, * ``user``: can be empty (``bzr`` will defaults to python's
``getpass.get_user()``), * revision 1: add tutorial.txt
* revision 2: modify tutorial.txt
* revision 3: rename tutorial.txt to guide.txt; add tutorial.txt * {date} - date of the last revision
* {build_date} - current date
* {revno} - revision number
* {revision_id} - revision id
* {branch_nick} - branch nickname
* {clean} - 0 if the source tree contains uncommitted changes,
otherwise 1 + File versioned
- File unversioned
R File renamed
? File unknown
X File non-existent (and unknown to bzr)
C File has conflicts
P Entry for a pending merge (not a file) - delegate password storage to plugins (.netrc for example). - storing the passwords in various obfuscating encodings (base64 for one), :bound The branch this branch is bound to, for bound branches.
:parent The parent of this branch.
:public The public location of this branch.
:push The saved location used for `bzr push` with no arguments.
:submit The submit branch for this branch.
:this This branch. <<<<<<< TREE
Martin Pool released it.
=======
The project leader released Bazaar.
>>>>>>> MERGE-SOURCE <protocol>://[user[:password]@]host[:port]/[path] ================= =========================
Supported formats Autodetected by extension
================= =========================
dir (none)
tar .tar
tbz2 .tar.bz2, .tbz2
tgz .tar.gz, .tgz
zip .zip
================= ========================= ============================ ============ ============
URL Abbreviation Example
============================ ============ ============
https://bugs.launchpad.net/ lp lp:12345
http://bugs.debian.org/ deb deb:12345
http://bugzilla.gnome.org/ gnome gnome:12345
============================ ============ ============ ? - Matches any single character except '/'
* - Matches 0 or more characters except '/'
/**/ - Matches 0 or more directories in a path
[a-z] - Matches a single character from within a group of characters 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. BZR_DISABLE_PLUGINS='myplugin:yourplugin' BZR_PLUGIN_PATH='-site:+user' BZR_PLUGIN_PATH='-user:-core:-site' BZR_PLUGIN_PATH='/path/to/my/other/plugins' BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user Conflict adding file FILE. Moved existing file to FILE.moved. Conflict adding files to FILE. Created directory. Conflict moving FILE into DIRECTORY. Cancelled move. Conflict: can't delete DIR because it is not empty. Not deleting. Conflict: foo.new is not a directory, but has files in it.
Created directory. Conflicting tags:
version-0.1 Contents conflict in FILE 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: Feature long short line
---------------------- ------------- ------------ -------------------
design goal detailed view concise view 1 revision per line
committer name+email name only name only
author name+email - -
date-time format full date only date only
commit message full full top line
tags yes yes yes
merges indicator - yes -
status/delta optional optional -
diff/patch optional optional -
revision-id optional optional -
branch nick yes - -
foreign vcs properties yes yes -
preferred levels all 1 1
digital signature optional - - 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 accidentally 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: N File created
D File deleted
K File kind changed
M File modified 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). Path conflict: PATH1 / PATH2 RE:(?i)foo Remove the branch at repo/trunk:: 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:: Set the Launchpad ID of the current user to 'bob':: 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. Text conflict in FILE 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 define a named view and switch to it:: To delete a named view:: To delete all views:: To delete the current view:: To disable the current view without deleting it:: 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. To list a named view:: To list all views defined:: To list the current view:: To switch to a named view:: 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``:: [/home/vila/src/bzr/bugs]
mypush = lp:~vila/bzr
mypush:policy=appendpath [/home/vila/src/bzr/bugs]
mypush = lp:~vila/bzr/{branchname} [/home/vila/src/bzr/bugs]
mypush = lp:~vila/bzr/{relpath} [/home/vila/src/bzr]
mypush = lp:~vila/bzr/{basename} [/top/location]
push_location = sftp://example.com/location
push_location:policy = appendpath [ALIASES]
commit = commit --strict
log10 = log --short -r -10..-1
[DEFAULT]
email=John Doe <jdoe@isp.com> [DEFAULT]
log_format = short [myprojects]
scheme=ftp
host=host.com
user=joe
password=secret
[name *.bat]
eol = crlf [name *.png]
eol = exact [name *.sh]
eol = lf [name *]
eol = native [name *]
eol = native-with-crlf-in-repo [name test_data/]
eol = exact ``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 resolve FILE --action=done' ``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``. aftp:// Access using active FTP.
bzr:// Fast access using the Bazaar smart server.
bzr+ssh:// Fast access using the Bazaar smart server over SSH.
file:// Access using the standard filesystem (default)
ftp:// Access using passive FTP.
http:// Read-only access of branches exported on the web.
https:// Read-only access of branches exported on the web using SSL.
sftp:// Access using SFTP (most SSH servers provide SFTP). bzr add make files or directories versioned
bzr ignore ignore a file or pattern
bzr mv move or rename a versioned file bzr branch ftp://host.com/path/to/my/branch bzr branch ftp://joe:secret@host.com/path/to/my/branch bzr config mypush
lp:~vila/bzr/832013-expand-in-stack 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 help init more help on e.g. init command
bzr help commands list all commands
bzr help topics list all help topics
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 log show history of changes
bzr check validate storage bzr log file:///tmp/%2False (refers to a file called /tmp/\/alse)
bzr log %252False (refers to a file called /tmp/%252False) bzr log foo,branch=bla # path "foo" with the segment parameter "branch" set to "bla"
bzr log file:foo%2Cbranch=bla # path "foo,branch=bla"
bzr log file:foo,branch=bla # path "foo" with segment parameter "branch" set to "bla"
bzr lp-find-proposal -r annotate:README:1 bzr lp-propose-merge --review jrandom --review review-team=qa bzr merge pull in changes from another branch
bzr commit save some or all changes
bzr send send changes via email bzr status summarise changes in working copy
bzr diff show detailed diffs bzr version-info --custom \
--template="#define VERSION_INFO \"Project 1.2.3 (r{revno})\"\n" bzr+ssh://remote@shell.example.com/~/myproject/trunk bzr.default_mergetool = kdiff3
bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result} cd /tmp
bzr log /tmp/%2False
bzr log %2False
bzr log file:///tmp/%252False
bzr log file://localhost/tmp/%252False
bzr log file:%252False checkout Create a working tree when a branch does not have one.
remove-tree Removes the working tree from a branch when it is safe to do so.
update When a working tree is out of sync with its associated branch
this will update the tree to match the branch.
checkout Create a checkout. Pass --lightweight to get a lightweight
checkout
update Pull any changes in the master branch in to your checkout
commit Make a commit that is sent to the master branch. If you have
a heavy checkout then the --local option will commit to the
checkout without sending the commit to the master
switch Change the master branch that the commits in the checkout will
be sent to
bind Turn a standalone branch into a heavy checkout so that any
commits will be sent to the master branch
unbind Turn a heavy checkout into a standalone branch so that any
commits are only made locally
info Displays whether a branch is bound or unbound. If the branch is
bound, then it will also display the location of the bound branch
gio+ Access using any GIO supported protocols. http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk http_proxy=http://proxy.example.com:3128/
https_proxy=http://proxy.example.com:3128/ init Change a directory into a versioned branch.
branch Create a new branch that is a copy of an existing branch.
merge Perform a three-way merge.
bind Bind a branch to another one.
init Make a directory into a versioned branch.
init-repository Create a shared repository. Use --no-trees to create one
in which new branches won't get a working tree.
yyy.hooks.install_named_hook("xxx", ...) {base} file.BASE
{this} file.THIS
{other} file.OTHER
{result} output file
{this_temp} temp copy of file.THIS, used to overwrite output file if merge
succeeds. * File system paths, relative or absolute * Fully qualified URLs * To reapply read converters, ``touch`` files, i.e. update their
timestamp. Operations like ``bzr status`` should then reapply the
relevant read converters and compare the end result with the
canonical format. * To reapply write converters, ensure there are no local changes,
delete the relevant files and run ``bzr revert`` on those files. 1. the first match wins, 2. empty fields match everything, 3. ``scheme`` matches even if decorators are used in the requested URL, 4. ``host`` matches exactly or act as a domain if it starts with '.'
(``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf.net``
will not match ``bzr.sf.net``). 5. ``port`` matches if included in the requested URL (exact matches only) 6. ``path`` matches if included in the requested URL (and by rule #2 above,
empty paths will match any provided path). ========== ===================================== ======================
Value Checkout end-of-lines as Commit end-of-lines as
========== ===================================== ======================
``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``
---------- ------------------------------------- ----------------------
``lf`` ``lf`` ``lf``
---------- ------------------------------------- ----------------------
``crlf`` ``crlf`` ``lf``
---------- ------------------------------------- ----------------------
``exact`` No conversion Exactly as in file
========== ===================================== ====================== ============================ ======================== ======================
Value Checkout end-of-lines as Commit end-of-lines as
============================ ======================== ======================
``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``
``lf`` otherwise
---------------------------- ------------------------ ----------------------
``lf-with-crlf-in-repo`` ``lf`` ``crlf``
---------------------------- ------------------------ ----------------------
``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``
============================ ======================== ====================== none:
the value is interpreted the same for contained locations. This is
the default behaviour.
norecurse:
the value is only used for the exact location specified by the
section name.
appendpath:
for contained locations, any additional path components are
appended to the value. "%(alias_name)s" is not a valid location alias. "%(function)s" called on an AtomicFile after it was closed: "%(path)s" "%(invalid_id)s" is not a valid shelf id, try a number instead. "%(path)s" is not a directory %(extra)s "%(path)s" is not in the working directory %(extra)s "%s" is not a valid <plugin_name>@<plugin_path> description "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
produces patches suitable for "patch -p1". %(bzrdir)r does not support co-located branches. %(context_info)s%(path)s is already versioned. %(context_info)s%(path)s is not versioned. %(exe_name)s could not be found on this machine %(msg)s %(host)s%(port)s%(orig_error)s %(not_locked)r is not write locked but needs to be. %(source)s is%(permanently)s redirected to %(target)s %(target)s
is not compatible with
%(source)s
%(details)s %(url)s is not a local path. %(username)r does not seem to contain a reasonable email address %(value)s is not an index of type %(_type)s. %6d file-ids %6d ghost revisions %6d inconsistent parents %6d revisions %6d revisions and inventories %6d revisions are mentioned but not present %6d revisions are missing inventory_sha1 %6d revisions have incorrect parents in the revision index %6d revisions missing parents in ancestry %6d revisions not present %6d texts %6d unreferenced text versions %d conflict auto-resolved. %d conflicts auto-resolved. %d conflicts encountered. %d proposals(s) found. %d tag updated. %d tags updated. %r is too short to calculate a relative path %s
Commit refused. %s - Stage %s cannot canonicalise CHKs. %s has no associated product or source package. %s has no development focus. %s is already up-to-date. %s is not registered on Launchpad %s is now not stacked
'%(display_url)s' is already a branch. '%(display_url)s' is already a checkout. '%(display_url)s' is already a lightweight checkout. '%(display_url)s' is already a tree. '%(display_url)s' is already standalone. '%(display_url)s' is already using a shared repository. '%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-reconfigure. '{0}' view is: {1}
(Default: "bzr"). The path to the command that should be used to run the smart
server for bzr. This value may only be specified in locations.conf, because: (Default: "gpg"). Which program should be used to sign and check revisions.
For example:: (Default: "localhost"). SMTP server to use when Bazaar needs to send
email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin. (The --force option is deprecated, rather use --no-backup in future.) (default) * 0 = Standard SIGQUIT behaviour (normally, exit with a core dump)
* 1 = Invoke breakin debugger (default) * 0 = Standard behaviour
* 1 = Launch debugger * A machine-readable description of the merge to perform * An optional bundle of revision data, so that the changes can be applied
directly from the merge directive, without retrieving data from a
branch. * An optional patch that is a preview of the changes requested * Ignore patterns starting with "#" act as comments in the ignore file.
To ignore patterns that begin with that character, use the "RE:" prefix. * ``+user``, ``+core``, ``+site`` will add the corresponding path
before the remaining default values (and also remove it from
the default values). * ``--action=done`` will just mark the conflict as resolved. * ``--action=take-other`` will issue ``bzr rm directory`` including the
children, * ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white``
in ``black``,
* ``--action=take-other`` will revert Bazaar choice and move ``black`` in
``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,
* ``--action=done`` will just mark the conflict as resolved. * ``--action=take-this`` will acknowledge Bazaar choice to keep the directory, * ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,
* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,
* ``--action=done`` will just mark the conflict as resolved. * ``--action=take-this`` will issue ``bzr rm --force foo.new`` and
``bzr add foo``,
* ``--action=take-other`` will issue ``bzr rm --force foo`` and
``bzr mv foo.new foo``,
* ``--action=done`` will just mark the conflict as resolved. * ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved FILE``,
* ``--action=take-other`` will issue ``bzr rm FILE.moved``,
* ``--action=done`` will just mark the conflict as resolved. * ``--action=take-this`` will issue ``bzr rm directory`` including the
children,
* ``--action=take-other`` will acknowledge Bazaar choice to keep the children
and restoring the directory,
* ``--action=done`` will just mark the conflict as resolved. * ``--action=take-this`` will issue ``mv FILE.THIS FILE``,
* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``. * ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by
issuing ``bzr mv PATH2 PATH1``,
* ``--action=take-other`` will acknowledge Bazaar choice of keeping ``PATH2``,
* ``--action=done`` will just mark the conflict as resolved. * ``-user``, ``-core``, ``-site`` will remove the corresponding
path from the default values, * ``authentication.conf`` describes credential information for
remote servers. * ``bazaar.conf`` describes default configuration options, * ``conflict`` (the default): will leave the orphans in place and
generate a conflicts, * ``format_deprecation``:
whether the format deprecation warning is shown on repositories that are
using deprecated formats. * ``host``: the remote server, * ``locations.conf`` describes configuration information for
specific branch locations, * ``move``: will move the orphans to a ``bzr-orphans`` directory at the root
of the working tree with names like ``<file>.~#~``. * ``password``: the password. * ``path``: the branch location, * ``port``: the port the server is listening, * ``user``: the login to be used, * a canonical format - how files are stored internally
* a convenience format - how files are created in a working tree. * a read converter - converts from convenience to canonical format
* a write converter - converts from canonical to convenience format. * add a ``password_encoding`` field allowing: * add a ``verify_certificates`` field for ``HTTPS``. * the bzrlib directory (containing the ``core`` plugins), * the site specific plugin directory if applicable (containing
the ``site`` plugins). * the user specific plugin directory (containing the ``user`` plugins), * update the credentials when the user is prompted for user or password, *** Ignoring files outside view. View is %s *** {0} content-filter: {1} => {2!r} , the header appears corrupt, try passing -r -1 to set the state to the last commit - it's needed before branch.conf is accessible
- allowing remote branch.conf files to specify commands would be a security
risk - not supported for merge directives that use more than one output file. --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 --exclude-common-ancestry requires two different 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/") --product is deprecated; please use --project. --profile Profile execution using the hotshot profiler.
--lsprof Profile execution using the lsprof profiler.
--lsprof-file Profile execution using the lsprof profiler, and write the
results to a specified file. If the filename ends with ".txt",
text format will be used. If the filename either starts with
"callgrind.out" or end with ".callgrind", the output will be
formatted for use with KCacheGrind. Otherwise, the output
will be a pickle.
--coverage Generate line coverage report in the specified directory. --remember requires a branch to be specified. --tree and --revision can not be used together --uncommitted requires a working tree --verbose requires a merge directive --verbose shows the path where each plugin is located. --verbose will print out what is being removed.
--dry-run will go through all the motions, but not actually
remove anything. --version Print the version number. Must be supplied before the command.
--no-aliases Do not process command aliases when running this command.
--builtin Use the built-in version of a command, not the plugin version.
This does not suppress other plugin effects.
--no-plugins Do not process any plugins.
--no-l10n Do not translate messages.
--concurrency Number of processes that can be run concurrently (selftest). -Dauth Trace authentication sections used.
-Dbytes Print out how many bytes were transferred
-Ddirstate Trace dirstate activity (verbose!)
-Derror Instead of normal error handling, always print a traceback
on error.
-Devil Capture call sites that do expensive or badly-scaling
operations.
-Dfetch Trace history copying between repositories.
-Dfilters Emit information for debugging content filtering.
-Dforceinvdeltas Force use of inventory deltas during generic streaming fetch.
-Dgraph Trace graph traversal.
-Dhashcache Log every time a working file is read to determine its hash.
-Dhooks Trace hook execution.
-Dhpss Trace smart protocol requests and responses.
-Dhpssdetail More hpss details.
-Dhpssvfs Traceback on vfs access to Remote objects.
-Dhttp Trace http connections, requests and responses.
-Dindex Trace major index operations.
-Dknit Trace knit operations.
-Dlock Trace when lockdir locks are taken or released.
-Dnoretry If a connection is reset, fail immediately rather than
retrying the request.
-Dprogress Trace progress bar operations.
-Dmem_dump Dump memory to a file upon an out of memory error.
-Dmerge Emit information for debugging merges.
-Dno_apport Don't use apport to report crashes.
-Dno_activity Don't show transport activity indicator in progress bar.
-Dpack Emit information about pack operations.
-Drelock Emit a message every time a branch or repository object is
unlocked then relocked the same way.
-Dsftp Trace SFTP internals.
-Dstatic_tuple Error when a tuple is used where a StaticTuple is expected
-Dstream Trace fetch streams.
-Dstrict_locks Trace when OS locks are potentially used in a non-portable
manner.
-Dunlock Some errors during unlock are treated as warnings.
-DIDS_never Never use InterDifferingSerializer when fetching.
-DIDS_always Always use InterDifferingSerializer to fetch if appropriate
for the format, even for non-local fetches.
-Oname=value Override the ``name`` config option setting it to ``value`` for
the duration of the command. This can be used multiple times if
several options need to be overridden. .. _Python regular expressions: http://docs.python.org/library/re.html .. note:: 1. Modify the working tree content so that the conflicted item is now in the
state you want to keep, then 1. user and password 2. Inform Bazaar that the conflict is now solved and ask to cleanup any
remaining generated information (``bzr resolve <item>``). 2. user, realm and password :2a:
(native) (default) Format for the bzr 2.0 series. Uses group-
compress storage. Provides rich roots which are a one-way
transition. :Aliases: :Checks: :Custom authors: :Description:
%s
: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:: :Examples:
bzr break-lock
bzr break-lock bzr+ssh://example.com/bzr/foo
bzr break-lock --conf ~/.bazaar :Examples:
Show the Launchpad ID of the current user:: :Examples:
To define the current view:: :Exit values:
1 - changed
2 - unrepresentable changes
3 - error
0 - no change :From: plugin "%s"
:Notes:
* Ignore patterns containing shell wildcards must be quoted from
the shell on Unix. :On Unix: ~/.bazaar/bazaar.conf
:On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf :Options:%s :Ordering control: :Other filtering: :Output control: :Path filtering: :Purpose: %s
:Revision filtering: :See also: %s :Selective commits: :Things to note: :Tips & tricks: :Usage:
%s
:Usage: %s
:ancestor: :annotate: :before: :branch: :claws: Use Claws. This skips a dialogue for attaching files.
:evolution: Use Evolution.
:kmail: Use KMail.
:mutt: Use Mutt.
:thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove 1.5,
this works around some bugs that xdg-email doesn't handle. :date: :default: See above.
:editor: Use your editor to compose the merge request. This also uses
your commit id, (see ``bzr whoami``), smtp_server and (optionally)
smtp_username and smtp_password.
:mapi: Use your preferred e-mail client on Windows.
:xdg-email: Use xdg-email to run your preferred mail program :development-colo:
(native) The 2a format with experimental support for colocated
branches. :doc:`{0} <{1}-help>` :last: :mainline: :pack-0.92:
(native) 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. :revid: :revid:
Selects a revision using the revision id.
:submit:
Selects a common ancestor with the submit branch.
:ancestor:
Selects a common ancestor with a second branch.
:date:
Selects a revision on the basis of a datestamp.
:branch:
Selects the last revision of a specified branch.
:tag:
Selects a revision identified by a tag name.
:revno:
Selects a revision using a number.
:before:
Selects the parent of the revision specified.
:annotate:
Select the revision that last modified the specified line.
:mainline:
Select mainline revision that merged the specified revision.
:last:
Selects the nth revision from the end. :revno: :submit: :tag: =================== ===========================================================
BZRPATH Path where bzr is to look for shell plugin external
commands.
BZR_EMAIL E-Mail address of the user. Overrides EMAIL.
EMAIL E-Mail address of the user.
BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.
EDITOR Editor for editing commit messages.
BZR_PLUGIN_PATH Paths where bzr should look for plugins.
BZR_DISABLE_PLUGINS Plugins that bzr should not load.
BZR_PLUGINS_AT Plugins to load from a directory not in BZR_PLUGIN_PATH.
BZR_HOME Directory holding .bazaar config dir. Overrides HOME.
BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA and
HOME.
BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// URLs).
BZR_SSH Path to SSH client, or one of paramiko, openssh, sshcorp,
plink or lsh.
BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).
BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).
BZR_COLUMNS Override implicit terminal width.
BZR_CONCURRENCY Number of processes that can be run concurrently (selftest)
BZR_PROGRESS_BAR Override the progress display. Values are 'none' or 'text'.
BZR_PDB Control whether to launch a debugger on error.
BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a
breakin debugger.
BZR_TEXTUI_INPUT Force console input mode for prompts to line-based (instead
of char-based).
=================== ===========================================================
A Python unicode encoding name for text output from bzr, such as log
information. Values include: utf8, cp850, ascii, iso-8859-1. The default
is the terminal encoding preferred by the operating system. A Solution
---------- 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 branch consists of the state of a project, including all of its
history. All branches have a repository associated (which is where the
branch history is stored), but multiple branches may share the same
repository (a shared repository). Branches can be copied and merged. A checkout is created with the bzr checkout command (see "help checkout").
You pass it a reference to another branch, and it will create a local copy
for you that still contains a reference to the branch you created the
checkout from (the master branch). Then if you make any commits they will be
made on the other branch first. This creates an instant mirror of your work, or
facilitates lockstep development, where each developer is working together,
continuously integrating the changes of others. A comma-separated list of debugging options to turn on. The same values
can be used as with the -D command-line option (see `help global-options`).
For example:: A comment is any line that starts with a "#" (sometimes called a "hash
mark", "pound sign" or "number sign"). Comment lines are ignored by
Bazaar when parsing ini files. A control directory already exists: "%(path)s". A criss-cross in the branch history can cause the default merge technique
to emit more conflicts than would normally be expected. A detailed description of each keyword is given below. A directory cannot be a bundle A format name for the default format used when creating branches. See ``bzr
help formats`` for possible values. A hook of type *xxx* of class *yyy* needs to be registered using:: A list of strings, each string represent a warning that can be emitted by
bzr. Mentioning a warning in this list tells bzr to not emit it. A log format controls how information about each revision is displayed.
The standard log formats are compared below:: A mail client to use for sending merge requests.
By default, bzr will try to use ``mapi`` on Windows. On other platforms, it
will try ``xdg-email``. If either of these fails, it will fall back to
``editor``. A merge directive must provide either a bundle or a public branch location. A merge directive provides many things needed for requesting merges: A number of debug flags are also available to assist troubleshooting and
development. See :doc:`debug-flags-help`.
A option can reference other options by enclosing them in curly brackets:: A plugin is an external component for Bazaar that extends the
revision control system, by adding or replacing code in Bazaar.
Plugins can do a variety of things, including overriding commands,
adding new commands, providing additional network transports and
customising log output. A publicly-accessible version of this branch (implying that this version is
not publicly-accessible). Used (and set) by ``bzr send``. A revision identifier refers to a specific state of a branch's history. It
can be expressed in several ways. It can begin with a keyword to
unambiguously specify a given lookup type; some examples are 'last:1',
'before:yesterday' and 'submit:'. A section header is a word enclosed in brackets that starts at the beginning
of a line. A typical section header looks like this:: A section option resides within a section. A section option contains an
option name, an equals sign and a value. For example:: A standalone tree is a working tree with an associated repository. It
is an independently usable branch, with no dependencies on any other.
Creating a standalone tree (via bzr init) is the quickest way to put
an existing project under version control. A target configuration must be specified. A transaction related operation was attempted after the transaction finished. A typical ``bazaar.conf`` section often looks like the following:: A typical config file might look something like:: A warning will be printed when nested trees are encountered,
unless they are explicitly ignored. A working tree is the contents of a branch placed on disk so that you can
see the files and edit them. The working tree is where you make changes to a
branch, and when you commit the current state of the working tree is the
snapshot that is recorded in the commit. Add file "%(path)s"? 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. Adding file contents 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. After unbinding, the local branch is considered independent and subsequent
commits will be local only. Aliases for remembered locations All changes applied successfully. All commits signed with verifiable keys All conflicts resolved. All connections are done with the same ``user`` (the remote one for which the
default bzr one is not appropriate) and the password is always prompted with
some exceptions:: All hidden commands Already a branch: "%(path)s". Alternately, it can be given without a keyword, in which case it will be
checked as a revision number, a tag, a revision id, a date specification, or a
branch specification, in that order. For example, 'date:today' could be
written as simply 'today', though if you have a tag called 'today' that will
be found first. Alternatively, to change the log format used for a given query, use the
--long, --short or --line options. Alternatively, to list just the files:: An attempt to access a url outside the server jail was made: '%(url)s'. An error has been detected in the repository %(repo_path)s.
Please run bzr reconcile on this repository. 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. An inconsistent delta was supplied involving %(path)r, %(file_id)r
reason: %(reason)s An inconsistent delta was supplied: %(delta)r
reason: %(reason)s An ini file has three types of contructs: section headers, section
options and comments. Another class is 'detritus', which includes files emitted by bzr during
normal operations and selftests. (The value of these files decreases with
time.) Another possible use for a checkout is to use it with a treeless repository
containing your branches, where you maintain only one working tree by
switching the master branch that the checkout points to when you want to
work on a different branch. Another such option is ``basename`` which can be used like this:: Another such option is ``branchname``, which refers to the name of a colocated
branch. For non-colocated branches, it behaves like basename. It can be used
like this:: Any action will also delete the previously generated ``.BASE``, ``.THIS`` and
``.OTHER`` files if they are still present in the working tree. Any files matching patterns in the ignore list will not be added
unless they are explicitly mentioned. Any revision involved in the merge may be specified-- the revision in
which the merge was performed, or one of the revisions that was merged. Apply %d change(s)? Apply binary changes? Apply change? Apply changes and remove from the shelf. Apply changes but don't delete them. Apply content filters to display the convenience form. Apply content filters to export the convenient form. Apply list or delete action to all views. Apply phase Apply uncommitted changes from a working copy, instead of branch changes. Are you sure you wish to delete these As for the ``PATH`` variables, if multiple directories are
specified in ``BZR_PLUGIN_PATH`` they should be separated by the
platform specific appropriate character (':' on Unix,
';' on windows) Ask Launchpad to mirror a branch now. At %s you have a valid .bzr control directory, but not a branch or repository. This is an unsupported configuration. Please move the target directory out of the way and try again. At company.com, the server hosting release and integration branches is behind a
proxy, and the two branches use different authentication policies:: At the same time it is run it may recompress data resulting in
a potential saving in disk space or performance gain. Attempt to reuse a transform that has already been applied. Authenticated as %s Authentication Settings
======================= Authentication definitions
-------------------------- Authors Automatically guess renames. Avoid making changes when guessing renames. BZRPATH
~~~~~~~ BZR_DISABLE_PLUGINS
~~~~~~~~~~~~~~~~~~~ BZR_EDITOR
~~~~~~~~~~ BZR_EMAIL
~~~~~~~~~ BZR_HOME
~~~~~~~~ BZR_LOG
~~~~~~~ BZR_PDB
~~~~~~~ BZR_PLUGINS_AT
~~~~~~~~~~~~~~ BZR_PROGRESS_BAR
~~~~~~~~~~~~~~~~ BZR_REMOTE_PATH
~~~~~~~~~~~~~~~ BZR_SIGQUIT_PDB
~~~~~~~~~~~~~~~ BZR_SSH
~~~~~~~ Backing up inventory Backup Inventory created Backup changed files (default). Backup inventory created. Bad bzr revision-bundle: %(text)r Bad merge directive payload %(start)r Bad value "%(value)s" for option "%(name)s". Bad value "%(value)s" for option "%(name)s".
See ``bzr help %(name)s`` Basic commands Basic commands:
bzr init makes this directory a versioned branch
bzr branch make a copy of another branch Basic help for all commands Basic information on shared repositories. Bazaar 2.6b2 -- a free distributed version-control tool
http://bazaar.canonical.com/ Bazaar allows locations to be specified in multiple ways, either: 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. Bazaar cannot auto-detect when conflicts of this kind have been resolved. Bazaar defines several aliases for locations associated with a branch. These
can be used with most commands that expect a location, such as `bzr push`. Bazaar knows about a few bug trackers that have many users. If
you use one of these bug trackers then there is no setup required to
use this feature, you just need to know the tracker identifier to use.
These are the bugtrackers that are built in: Bazaar supports all of the standard parts within the URL:: Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the
conflict if and only if there's an actual conceptual conflict in the source
tree. Because Bazaar doesn't understand the real meaning of the files being
versioned, it can, when faced with ambiguities, fall short in either direction
trying to resolve the conflict itself. Many kinds of changes can be combined
programmatically, but sometimes only a human can determine the right thing to
do. Bazaar uses patterns to match files at various times. For example,
the ``add`` command skips over files that match ignore patterns
and preferences can be associated with files using rule patterns.
The pattern syntax is described below. Bazaar's content filtering allows you to store files in a different
format from the copy in your working tree. This lets you, or your
co-developers, use Windows development tools that expect CRLF files
on projects that use other line-ending conventions. Among other things,
content filters also let Unix developers more easily work on projects
using Windows line-ending conventions, keyword expansion/compression,
and trailing spaces on lines in text files to be implicitly stripped
when committed. 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. Before using this command you must register the project to which the
branch belongs, and create an account for yourself on launchpad.net. Binary files section encountered. Bind new branch to from location. Body for the email. Both --delete and --switch specified Both --delete and a file list specified Both --switch and --all specified Both --switch and a file list specified Both the submit branch and the public branch follow the usual behaviour with
respect to --remember: If there is no default location set, the first send
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 location can be accessed. Bound branch %(branch)s is out of date with master branch %(master)s.%(extra_help)s Bound branches use the nickname of its master branch unless it is set
locally, in which case binding will update the local nickname to be
that of the master. Bound branches use the nickname of its master branch unless it is set
locally, in which case switching will update the local nickname to be
that of the master. Bound branches use the nickname of its master branch unless it is set
locally. Branch "%(branch_url)s" appears to be bound to itself. Please use `bzr unbind` to fix. Branch %(base)s is missing revision %(text_revision)s of %(file_id)s Branch %(branch)s has no commits. Branch author's email address, if not yourself. Branch format Branch in which to place the tag. Branch is active. Use --force to remove it. Branch is already bound Branch to bind checkout to. Branch to generate the submission from, rather than the one containing the working directory. Branch to merge into, rather than the one containing the working directory. Branch to operate on, instead of 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 whose tags should be displayed. Branch/tree to compare from. Branch/tree to compare to. Branched %d revision. Branched %d revisions. Branches Branches Out of Sync Branches and working trees will also report any missing revisions. Branches are up to date.
Branches have no common ancestor, and no merge base revision was specified. Branches in the repository will default to not having a working tree. Branching '%(url)s'(%(format)s) must create a working tree. Break a dead lock. Bug Tracker Settings Bug tracker settings Building tree Bundle format %(bundle_format)s is incompatible with %(other)s Bundle format not supported Bundling %d revision. Bundling %d revisions. 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 if ``BZR_PLUGIN_PATH`` is set, it replaces searching
in ``user``. However it will continue to search in ``core`` and
``site`` unless they are explicitly removed. By default just running 'bzr init' will create a repository within the new
branch but it is possible to create a shared repository which allows multiple
branches to share their information in the same location. When a new branch is
created it will first look to see if there is a containing shared repository it
can use. 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 merge directive is self-contained and can be applied to any
branch containing submit_branch in its ancestory without needing access to
the source branch. By default the server is a read-only server. Supplying --allow-writes enables write access to the contents of the served directory and below. Note that ``bzr serve`` does not perform authentication, so unless some form of external authentication is arranged supplying this option leads to global uncontrolled write access to your file system. By default, only unknown files, not ignored files, are deleted. Versioned
files are never deleted. By default, the SUBMIT_BRANCH's review team will be requested to review
the merge proposal. This can be overridden by specifying --review (-R).
The parameter the launchpad account name of the desired reviewer. This
may optionally be followed by '=' and the review type. For example: 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, the most recently shelved changes are restored. However if you
specify a shelf by id those changes will be restored instead. This works
best when the changes don't depend on each other. 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. CAUTION: Locks should only be broken when you are sure that the process
holding the lock has been stopped. Calculating hashes Calculating text parents Called after a checkout switches branch. post_switch is called with a
bzrlib.branch.SwitchHookParams. Called after a commit is calculated but before it is completed.
pre_commit is called with (local, master, old_revno, old_revid,
future_revno, future_revid, tree_delta, future_tree). old_revid is
NULL_REVISION for the first commit to a branch, tree_delta is a
TreeDelta object describing changes from the basis revision. hooks
MUST NOT modify this delta. future_tree is an in-memory tree obtained
from CommitBuilder.revision_tree() and hooks MUST NOT modify this
tree. Called after a commit is performed on a tree. The hook is called with
a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the
commit was performed on is available via the mutable_tree attribute of
that object. Called after a completely new tree is built. The hook is called with
the tree as its only argument. Called after a merge. Receives a Merger object as the single argument.
The return value is ignored. Called after a new connection is established or a reconnect occurs.
The sole argument passed is either the connected transport or smart
medium instance. Called after a pull operation completes. post_pull is called with a
bzrlib.branch.PullResult object and only runs in the bzr client. Called after a push operation completes. post_push is called with a
bzrlib.branch.BranchPushResult object and only runs in the bzr client. Called after a tree transform has been performed on a tree. The hook
is called with the tree that is being transformed and the transform. Called after creating a command object to allow modifications such as
adding or removing options, docs etc. Called with the new
bzrlib.commands.Command object. Called after executing a command. Called with the command object. Called after new branch initialisation completes. post_branch_init is
called with a bzrlib.branch.BranchInitHookParams. Note that init,
branch and checkout (both heavyweight and lightweight) will all
trigger this hook. Called before a commit is performed on a tree. The start commit hook
is able to change the tree before the commit takes place. start_commit
is called with the bzrlib.mutabletree.MutableTree that the commit is
being performed on. Called before a merge. Receives a Merger object as the single
argument. Called before a tree transform on this tree. The hook is called with
the tree that is being transformed and the transform. Called by the bzr server when an exception occurs. server_exception is
called with the sys.exc_info() tuple return true for the hook if the
exception has been handled, in which case the server will exit
normally. Called by the bzr server when it starts serving a directory.
server_started is called with (backing urls, public url), where
backing_url is a list of URLs giving the server-specific directory
locations, and public_url is the public URL for the directory being
served. Called by the bzr server when it starts serving a directory.
server_started is called with (backing_urls, server_obj). Called by the bzr server when it stops serving a directory.
server_stopped is called with the same parameters as the
server_started hook: (backing_urls, public_url). Called in bzr client and server after a change to the tip of a branch
is made. post_change_branch_tip is called with a
bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,
uncommit will all trigger this hook. Called in bzr client and server before a change to the tip of a branch
is made. pre_change_branch_tip is called with a
bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,
uncommit will all trigger this hook. Called in the bzr client after a commit has completed. post_commit is
called with (local, master, old_revno, old_revid, new_revno,
new_revid). old_revid is NULL_REVISION for the first commit to a
branch. Called in the bzr client after an uncommit completes. post_uncommit is
called with (local, master, old_revno, old_revid, new_revno,
new_revid) where local is the local branch or None, master is the
target branch, and an empty branch receives new_revno of 0, new_revid
of None. Called prior to executing a command. Called with the command object. Called to determine an automatic tag name for a revision.
automatic_tag_name is called with (branch, revision_id) and should
return a tag name or None if no tag name could be determined. The
first non-None tag name returned will be used. Called when a commit message is being generated.
commit_message_template is called with the bzrlib.commit.Commit object
and the message that is known so far. commit_message_template must
return a new message to use (which could be the same as it was given).
When there are multiple hooks registered for commit_message_template,
they are chained with the result from the first passed into the
second, and so on. Called when a stacked branch is activating its fallback locations.
transform_fallback_location is called with (branch, url), and should
return a new url. Returning the same url allows it to be used as-is,
returning a different one can be used to cause the branch to stack on
a closer copy of that fallback_location. Note that the branch cannot
have history accessing methods called on it during this hook because
the fallback locations have not been activated. When there are
multiple hooks installed for transform_fallback_location, all are
called with the url returned from the previous hook.The order is
however undefined. Called when creating a single command if no command could be found.
Called with (command_name). get_missing_command should either return
None, or a Command object to be used for the command. Called when creating a single command. Called with (cmd_or_None,
command_name). get_command should either return the cmd_or_None
parameter, or a replacement Command object that should be used for the
command. Note that the Command.hooks hooks are core infrastructure.
Many users will prefer to use bzrlib.commands.register_command or
plugin_cmds.register_lazy. Called when enumerating commands. Called with a set of cmd_name
strings for all the commands found so far. This set is safe to mutate
- e.g. to remove a command. list_commands should return the updated
set of command names. Called when the smart client is submitting a request to the smart
server. Called with a bzrlib.smart.client.CallHookParams object.
Streaming request bodies, and responses, are not accessible. Called with a MergeRequestBodyParams when a body is needed for a merge
request. Callbacks must return a body. If more than one callback is
registered, the output of one callback is provided to the next. Called with a bzrlib.lock.LockResult when a physical lock is acquired. Called with a bzrlib.lock.LockResult when a physical lock is broken. Called with a bzrlib.lock.LockResult when a physical lock is released. Called with a bzrlib.merge.Merger object to create a per file merge
object when starting a merge. Should return either None or a subclass
of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be
called per file that needs to be merged (including when one side has
deleted the file and the other has changed it). See the
AbstractPerFileMerger API docs for details on how it is used by merge. Called with argument StatusHookParams after Bazaar has displayed the
status. StatusHookParams has the attributes (old_tree, new_tree,
to_file, versioned, show_ids, short, verbose). The last four arguments
correspond to the command line options specified by the user for the
status command. to_file is the output stream for writing. Called with argument StatusHookParams before Bazaar displays the
status. StatusHookParams has the attributes (old_tree, new_tree,
to_file, versioned, show_ids, short, verbose). The last four arguments
correspond to the command line options specified by the user for the
status command. to_file is the output stream for writing. Called with the Branch object that has been opened after a branch is
opened. Can't join trees because %s doesn't support rich root data.
You can use bzr upgrade on the repository. Can't reprocess and show base, because reprocessing obscures the relationship of conflicting lines to the base Can't subsume %(other_tree)s into %(tree)s. %(reason)s Can't use both --stacked-on and --unstacked Cancelled Cancelled
Cannot bind address "%(host)s:%(port)i": %(orig_error)s. Cannot change the 'off' pseudo view Cannot commit to branch %(branch)s. It is bound to %(master)s, which is bound to %(remote)s. Cannot convert from format %(from_format)s to format %(format)s. %(problem)s Cannot debug memory on win32 without ctypes or win32process Cannot do conflict reduction and show base. Cannot find registered bug tracker called %(abbreviation)s on %(branch)s Cannot join {0}. {1} Cannot lock %(lock)s: %(why)s Cannot lock: transport is read only: %(transport)s Cannot operate on "%(filename)s" because it is a control file Cannot operate on "%(filename)s" of unsupported kind "%(kind)s" Cannot perform local-only commits on unbound branches. Cannot pull --overwrite to a branch which is bound %(branch)s Cannot pull individual files Cannot set both --verbose and --null Cannot sign a range of non-revision-history revisions Cannot switch a branch, only a checkout. Cannot switch as local commits found in the checkout. Commit these to the bound branch or use --force to throw them away. 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 Cannot verify a range of non-revision-history revisions Case insensitive ignore patterns can be specified with regular expressions
by using the ``i`` (for ignore case) flag in the pattern. Certificate error: %(error)s Change "%(path)s" from %(this)s to %(other)s? Change target of "%(path)s" from "%(this)s" to "%(other)s"? Changes shelved with id "%d". Check if tree is clean. 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. Checking branch at '%s'. Checking repository at '%s'. Checking unused inventories Checking working tree at '%s'. Checkouts Checkouts are source trees that are connected to a branch, so that when
you commit in the source tree, the commit goes into that branch. They
allow you to use a simpler, more centralised workflow, ignoring some of
Bazaar's decentralised features until you want them. Using checkouts
with shared repositories is very similar to working with SVN or CVS, but
doesn't have the same restrictions. And using checkouts still allows
others working on the project to use whatever workflow they like. Column 1 - versioning/renames:: Column 2 - contents:: Column 3 - execute:: Combine a tree into its containing tree. Comma also has special meaning in URLs, because it denotes `segment parameters`_ Comma is also special in any file system paths that are specified. To use a literal
comma in a file system path, specify a URL and URL encode the comma:: Comma separated list of GPG key patterns which are acceptable for verification. CommandHooks
------------ Comments
^^^^^^^^ Commit changes into a new revision. Commit even if nothing has changed. Commit message. Commit refused because there are unknown files in the working tree. Committed revision %d. Committing%s Commonly used like this:
eval "`bzr bash-completion`" Compress the data within a repository. Config file %(filename)s is not UTF-8 encoded
Configuration Settings
======================= Configuration files are located in ``$HOME/.bazaar`` on Unix and
``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0`` on
Windows. (You can check the location for your system by using
``bzr version``.) Conflict Types
============== Conflict reduction is not supported for merge type %s. Conflicting tags in bound branch:
{0} Conflicts detected in working tree. Use "bzr conflicts" to list, "bzr resolve FILE" to resolve. Conflicts normally are listed as short, human-readable messages. If --text
is supplied, the pathnames of files with text conflicts are listed,
instead. (This is useful for editing all files with text conflicts.) Connection Timeout: %(msg)s%(orig_error)s Connection closed: %(msg)s %(orig_error)s Connection error: %(msg)s %(orig_error)s Container has data after end marker: %(excess)r Container has multiple records with the same name: %(name)s Contains the user's default configuration. The section ``[DEFAULT]`` is
used to define general configuration that will be applied everywhere.
The section ``[ALIASES]`` can be used to create command aliases for
commonly used options. Content Filters
=============== Content conflicts
----------------- Content filters are typically provided by plugins, so the first step
in using them is to install the relevant plugins and read their
documentation. Some plugins may be very specific about which files
they filter, e.g. only files ending in ``.java`` or ``.php``.
In other cases, the plugin may leave it in the user's hands to
define which files are to be filtered. This is typically done
using rule-based preferences. See ``bzr help rules`` for general
information about defining these. Content formats
--------------- Control whether SIGQUIT behaves normally or invokes a breakin debugger. Control whether to launch a debugger on error. ControlDirHooks
--------------- Conversion of content into/from working trees Convert the current branch into a checkout of the supplied branch.
If no branch is supplied, rebind to the last bound location. Convert the current checkout into a regular branch. Copying content Copying repository content as tarball... Corrupt or incompatible data stream: %(reason)s Corruption while decompressing repository file%(orig_error)s Could not acquire lock "%(lock)s": %(msg)s Could not determine branch to refer to. Could not determine revno for {%(revision_id)s} because its ancestry shows a ghost at {%(ghost_revision_id)s} Could not find an appropriate Differ for file "%(path)s" Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s Could not parse --commit-time: Could not parse options for index %(value)s. Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s Could not rename %(source)s => %(dest)s because both files exist. (Use --after to tell bzr about a rename that has already happened)%(extra)s Could not understand response from smart server: %(response_tuple)r 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. Create the target branch from this one before switching to it. Create, remove or modify a tag naming a revision. Created a {0} (format: {1})
Created new branch. Created new stacked branch referring to %s. Created tag %s. Creating new repository Criss-Cross Criss-crosses cause problems because of the way merge works. Bazaar's default
merge is a three-way merger; in order to merge OTHER into THIS, it must
find a basis for comparison, BASE. Using BASE, it can determine whether
differences between THIS and OTHER are due to one side adding lines, or
from another side removing lines. Criss-crosses mean there is no good choice for a base. Selecting the recent
merge points could cause one side's changes to be silently discarded.
Selecting older merge points (which Bazaar does) mean that extra conflicts
are emitted. Criss-crosses occur in a branch's history if two branches merge the same thing
and then merge one another, or if two branches merge one another at the same
time. They can be avoided by having each branch only merge from or into a
designated central branch (a "star topology"). Current Storage Formats Current storage formats Cycle in graph %(graph)r Debug Flags
=========== Decoded contents
Default rules for all branches are defined in the optional file
``BZR_HOME/rules``. Defines an external merge tool called <name> with the given command-line.
Arguments containing spaces should be quoted using single or double quotes. The
executable may omit its path if it can be found on the PATH. Defines the behaviour of signing revisions on commits. By default bzr will not
sign new commits. Defines the maximum file size the command line "add" operation will allow
in recursive mode, with files larger than this value being skipped. You may
specify this value as an integer (in which case it is interpreted as bytes),
or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of 0
will disable skipping. Delete all ignored files. 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 changes without applying them. Delete conflict files, merge and revert backups, and failed selftest dirs. Delete file "%(path)s"? Delete files unknown to bzr (default). Delete from bzr but leave the working copy. Delete obsolete packs to save disk space. Delete the view. Delete this tag rather than placing it. Deleted '%s' view.
Deleted all views.
Deleted changes with id "%d". Deleted tag %s. Deleting backup.bzr Deleting old repository content Deleting parent
--------------- Deletion Strategy Deprecated in: %s Description of the new revision. Destroy removed changes instead of shelving them. Detailed log format. Details on the configuration settings available Details on the logging formats available Determining hash hits Device or resource busy: "%(path)s"%(extra)s Did not understand bug identifier %(bug_id)s: %(reason)s. See "bzr help bugs" for more information on this feature. Diff format Diff format to use. Diff is not installed on this machine: %(msg)s Diff3 is not installed on this machine. Directory contains a branch, but no working tree (use bzr checkout if you wish to build a working tree): "%(path)s" Directory not empty: "%(path)s"%(extra)s Disabled '%s' view.
Disabling ``myplugin`` and ``yourplugin`` is achieved by:: Disabling all plugins (better achieved with --no-plugins):: Disabling the site directory while retaining the user directory:: Discovering What Has Diverged
----------------------------- Display all the defined values for the matching options. 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 active value for a given option. Display the default ignore rules that bzr uses. Display timezone as local, original, or utc. Display, set or remove a configuration option. Diverged Branches
================= Do not actually open the browser. Just say the URL we would use. Do not ask for confirmation before breaking the lock. Do not consider changes made to a given path. Do not include a bundle in the merge directive. Do not include a preview patch in the merge directive. Do not mark object type using indicator. Do not prompt before deleting. Do not rebase after push. 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 actually make changes. Don't actually sign anything, just print the revisions that would be signed. Don't backup changed files. Don't check that the user name is valid. Don't know how to handle SSH connections. Please set BZR_SSH environment variable. 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. Dry-run, pretending to remove the above revisions.
Duplicate paths
--------------- 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. EOL conversion is provided as a content filter where Bazaar internally
stores a canonical format but outputs a convenience format. See
``bzr help content-filters`` for general information about using these. EOL conversion needs to be enabled for selected file patterns using
rules. See ``bzr help rules`` for general information on defining rules.
Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or
%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be
supported in a future version of Bazaar. Each branch can also contain a configuration file that sets values specific
to that branch. This file is found at ``.bzr/branch/branch.conf`` within the
branch. This file is visible to all users of a branch, if you wish to override
one of the values for a branch with a setting that is specific to you then you
can do so in ``locations.conf``. Each description also indicates whether the hook runs on the client (the
machine where bzr was invoked) or the server (the machine addressed by
the branch URL). These may be, but are not necessarily, the same machine. Each section could define: Each section describes an authentication definition. Each section should define: Each type of conflict is explained below, and the action which must be done to
resolve the conflict is outlined. Empty commit message specified. Please specify a commit message with either --message or --file or leave a blank message with --message "". Enable completions for the selected plugin (default: all plugins) End of Line Conversion
====================== End of line marker was not \n in bzr revision-bundle Environment Variables Environment settings
--------------------- Environment variable names and values Error in command line options Error in data for index %(value)s. Error in merge modified format Error in processing weave: %(msg)s Error reading from %(path)r. Error(s) parsing config file %(filename)s:
%(errors)s Example:
~~~~~~~~ Excluding paths during commit is not supported by repository at %(repository)r. Experimental and deprecated storage formats Experimental formats are shown below. Explain how to use --revision 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. Exporting message from error: %s Exporting messages from builtin command: %s Exporting messages from plugin command: {0} in {1} External Merge Tools
-------------------- Failed to GPG sign data with command "%(command_line)s" Failed to GetProcessMemoryInfo() Failed to rename %(from_path)s to %(to_path)s: %(why)s Failed to verify GPG signature data with error "%(error)s" Fetch texts Fetching revisions File %(filename)s is not conflicted. File exists: %(path)r%(extra)s File format
----------- File id {%(file_id)s} already exists in inventory as %(entry)s File is binary but should be text. Filename %(filename)r is not valid in your current filesystem encoding %(fs_encoding)s Files Files
----- Files cannot be moved between branches. Filter on local branch revisions (inclusive). See "help revisionspec" for details. Filter on other branch revisions (inclusive). See "help revisionspec" for details. Find the proposal to merge this revision. Finding Launchpad branch Finding branch files Finding merge Finding proposals Finding revision-id Finding revisions Finding revno Finds the merge proposal(s) that discussed landing the specified revision.
This works only if the selected branch was the merge proposal target, and
if the merged_revno is recorded for the merge proposal. The proposal(s)
are opened in a web browser. Fixing last revision info {0} => {1} Fixing text parents For ``locations.conf``, the options from the section with the
longest matching section header are used to the exclusion of other
potentially valid section headers. A section header uses the path for
the branch as the section header. Some examples include:: For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin
with '~' as meaning that the rest of the path should be interpreted
relative to the remote user's home directory. For example if the user
``remote`` has a home directory of ``/home/remote`` on the server
shell.example.com, then:: For checkouts, the bind-to location will be auto-detected if not specified.
The order of preference is
1. For a lightweight checkout, the current bound location.
2. For branches that used to be checkouts, the previously-bound location.
3. The push location.
4. The parent location.
If none of these is available, --bind-to must be specified. For complicated changes, it is possible to edit the changes in a separate
editor program to decide what the file remaining in the working copy
should look like. To do this, add the configuration option For example, a case insensitive match for ``foo`` may be specified as:: For example, if you have a directory named '/tmp/%2False' these are all valid
ways of accessing the content (0x2F, or 47, is the ASCII code for forward slash):: For example, the ``appendpath`` policy can be used like this:: For example, to push to the parent location:: For example:: For lightweight checkouts, this changes the branch being referenced.
For heavyweight checkouts, this checks that there are no local commits
versus the current bound branch, then it makes the local branch a mirror
of the new location and binds to it. For more information on the possible uses of the authentication configuration
file see :doc:`authentication-help`. For more information on upgrades, see the Bazaar Upgrade Guide,
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/. For more information see http://help.launchpad.net/
For most conflict types, there are some obvious ways to modify the working
tree and put it into the desired state. For some types of conflicts, Bazaar
itself already made a choice, when possible. For new projects, it is recommended that end-of-lines be stored as ``lf``
and that users stick to the basic settings, i.e. ``native``, ``lf``,
``crlf`` and ``exact``. For performance reasons, Bazaar caches the timestamps of files in
a working tree, and assumes files are unchanged if their timestamps
match the cached values. As a consequence, there are times when
you may need to explicitly ask for content filtering to be reapplied
in one or both directions, e.g. after installing or reconfiguring
plugins providing it. For the bug trackers not listed above configuration is required.
Support for generating the URLs for any project using Bugzilla or Trac
is built in, along with a template mechanism for other bugtrackers with
simple URL schemes. If your bug tracker can't be described by one
of the schemes described below then you can write a plugin to support
it. For users working on a cross-platform project, here is a suggested rule
to use as a starting point:: For users working on an existing project that uses Windows newline
conventions in their Bazaar repository, this rule is suggested as a
starting point:: Format %(format)s cannot be initialised by this version of bzr. Format %(format)s is not compatible with .bzr version %(bzrdir)s. Format 0.9 does not permit bundle with no patch Format error in conflict listings 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). Format used by GNU ChangeLog files. Found %d dependent branches - upgrading ... General format
~~~~~~~~~~~~~~ Generate a shell function for bash command line completion. Generate only the shell function, don't enable it Generic bzr smart protocol error: %(details)s Generic path error: %(path)r%(extra)s) Get file contents from this tree. Ghost revision {%(revision_id)s} cannot be used here. Ghost tags not supported by format %(format)r. Giving a list of files will revert only those files. Otherwise, all files
will be reverted. If the revision is not specified with '--revision', the
working tree basis revision is used. A revert operation affects only the
working tree, not any revision history like the branch and repository or
the working tree basis revision. Global Options HPSS calls: {0} ({1} vfs) {2} HTTP MIME Boundary missing for %(path)s: %(msg)s HTTPS, SFTP servers and their proxy
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Handling such orphans, *before* the conflict is created, is controlled by
setting the ``bzr.transform.orphan_policy`` configuration option. Hard-link working tree files where possible. Hard-linking "%(path)s" is not supported Help on status flags Here are some general guidelines for doing this: How to fix diverged branches How to resolve the conflict. How you deal with this depends on *why* the branches are out of sync. However the checkout is still a first class branch in Bazaar terms, so that
you have the full history locally. As you have a first class branch you can
also commit locally if you want, for instance due to the temporary loss af a
network connection. Use the --local option to commit to do this. All the local
commits will then be made on the master branch the next time you do a non-local
commit. If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a
revision range. Examples: '3647..3649', 'date:yesterday..-1' and
'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes or
spaces around the '..'). If --all is specified, NAME is interpreted as a regular expression and all
matching options are displayed mentioning their scope. The active value
that bzr will take into account is the first one displayed for each option. If --all is specified, no FILE may be provided If --no-bundle is specified, then Bazaar doesn't send the contents of the
revisions, but only a structured request to merge from the
public_location. In that case the public_branch is needed and it must be
up-to-date and accessible to the recipient. The public_branch is always
included if known, so that people can check it later. If --revision is specified, uncommit revisions to leave the branch at the
specified revision. For example, "bzr uncommit -r 15" will leave the
branch at revision 15. 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 ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the
the way the plugin are searched. 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 revision is specified, changes since that revision will be shelved. 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 filenames are specified, only the changes to those files will be
shelved. Other files will be left untouched. If location is not specified the local tree is used.
If committer is not specified the default committer is used. If mail is being sent, a to address is required. This can be supplied
either on the commandline, by setting the submit_to configuration
option in the branch itself or the child_submit_to configuration option
in the submit branch. If no NAME is given, --all .* is implied. 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 options are specified, unknown files are deleted. Otherwise, option
flags are respected, and may be combined. 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 no tag name is specified it will be determined through the
'automatic_tag_name' hook. This can e.g. be used to automatically tag
upstream releases by reading configure.ac. See ``bzr help hooks`` for
details. If one of the standard log formats does not meet your needs, additional
formats can be provided by plugins.
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 present, defines the ``--strict`` option default value for checking
uncommitted changes before pushing into a different VCS without any
custom bzr metadata. If present, defines the ``--strict`` option default value for checking
uncommitted changes before pushing. If present, defines the ``--strict`` option default value for checking
uncommitted changes before sending a merge directive. If present, the location of a generic bug tracker instance referred to by
<tracker>. The location must contain an ``{id}`` placeholder,
which will be replaced by a specific bug ID. This option can then be used
together with ``bzr commit --fixes`` to mark bugs in that tracker as being
fixed by that commit. For example:: If present, the location of the Bugzilla bug tracker referred to by
<tracker>. This option can then be used together with ``bzr commit
--fixes`` to mark bugs in that tracker as being fixed by that commit. For
example:: If present, the location of the Trac instance referred to by
<tracker>. This option can then be used together with ``bzr commit
--fixes`` to mark bugs in that tracker as being fixed by that commit. For
example:: If present, the location of the default branch for pull or merge. This option
is normally set when creating a branch, the first ``pull`` or by ``pull
--remember``. If present, the location of the default branch for push. This option
is normally set by the first ``push`` or ``push --remember``. 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 set to "True" then revisions can only be appended to the log, not
removed. A branch with this setting enabled can only pull from another
branch if the other branch's log is a longer version of its own. This is
normally set by ``bzr init --append-revisions-only``. If you set it
manually, use either 'True' or 'False' (case-sensitive) to maintain
compatibility with previous bzr versions (older than 2.2). If set to "True", the branch should act as a checkout, and push each commit to
the bound_location. This option is normally set by ``bind``/``unbind``. If set to true, bzr will automatically break locks held by processes from
the same machine and user that are no longer alive. Otherwise, it will
print a message and you can break the lock manually, if you are satisfied
the object is no longer in use. If shelve --list is specified, previously-shelved changes are listed. 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 origin is the same for a run of consecutive lines, it is
shown only at the top, unless the --all option is given. 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 true (default), repository changes are flushed through the OS buffers
to physical disk. This is somewhat slower, but means data should not be
lost if the machine crashes. See also dirstate.fdatasync. If true (default), working tree metadata changes are flushed through the
OS buffers to physical disk. This is somewhat slower, but means data
should not be lost if the machine crashes. See also repository.fdatasync. If unset, the colocated branch name is used for colocated branches, and
the branch directory name is used for other branches. To print the
current nickname, execute with no argument. If you are using a checkout from a shared branch you will periodically want to
pull in all the changes made by others. This is done using the "update"
command. The changes need to be applied before any non-local commit, but
Bazaar will tell you if there are any changes and suggest that you use this
command when needed. If you edit the main copy, be sure to remove the herringbone markers. When
you are done editing, the file should look like it never had a conflict, and be
ready to commit. If you have a branch and the remote branch is out-of-date, you can push
the local changes using "bzr push". If the local branch is out of date, you
can do "bzr pull". If both branches have had changes, you can merge, commit
and then push your changes. If you decide that some of the changes aren't
useful, you can "push --overwrite" or "pull --overwrite" instead.
If you have a branch with a working tree that you do not want the 'remove-tree'
command will remove the tree if it is safe. This can be done to avoid the
warning about the remote working tree not being updated when pushing to the
branch. It can also be useful when working with a '--no-trees' repository
(see 'bzr help repositories'). If you have a branch with no working tree you can use the 'checkout' command
to create a working tree. If you run 'bzr checkout .' from the branch it will
create the working tree. If the branch is updated remotely, you can update the
working tree by running 'bzr update' in that directory. If you have a checkout and have done local commits, you can get back in sync
by running "bzr update" (and possibly "bzr commit"). If you have an existing repository with text files already stored using
Windows newline conventions (``crlf``), then you may want to keep using that
convention in the repository. Forcing certain files to this convention
may also help users who do not have rules configured. To do this, set
``eol`` to one of the values below. If you have binary files that do not contain a null byte though, be
sure to add ``eol = exact`` rules for those as well. You can do this
by giving more explicit patterns earlier in the rules file. For example:: 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 have sample test data that deliberately has text files with mixed
newline conventions, you can ask for those to be left alone like this:: If you need to change the order or remove one of these
directories, you should use special values: 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 take the care to create files with their required endings, you can
achieve *almost* the same thing by using ``eol = exact``. It is slightly
safer to use ``lf`` and ``crlf`` though because edits accidentally
introducing mixed line endings will be corrected during commit for files
with those settings. If you use Bugzilla or Trac, then you only need to set a configuration
variable which contains the base URL of the bug tracker. These options
can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific
configuration section in ``locations.conf``. You can set up these values
for each of the projects you work on. 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 have a working tree on a remote machine that you push to you
can either run 'bzr update' in the remote branch after each push, or use some
other method to update the tree during the push. There is an 'rspush' plugin
that will update the working tree using rsync as well as doing a push. There
is also a 'push-and-update' plugin that automates running 'bzr update' via SSH
after each push. 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. If your working tree is on a network drive shared by users on different
operating systems, you typically want to force certain conventions for
certain files. In that way, if a file is created with the wrong line
endings or line endings get mixed during editing, it gets committed
correctly and gets checked out correctly. For example:: Ignore differences between branches and overwrite unconditionally. Ignore patterns may be prefixed with ``!``, which means that a filename
matched by that pattern will not be ignored. Ignore specified files or patterns. Ignoring files outside view. View is %s Importing revisions In addition, one branch may be bound to another one. Binding to another
branch indicates that commits which happen in this branch must also
happen in the other branch. Bazaar ensures consistency by not allowing
commits when the two branches are out of date. In order for a commit
to succeed, it may be necessary to update the current branch using
``bzr update``. In addition, plugins can provide other keywords. In both cases, the working tree is updated and uncommitted changes
are merged. The user can commit or revert these as they desire. In both cases, when used in a directory like
``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get:: In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may give
better results. You may wish to ``bzr revert`` the working tree and merge
again. Alternatively, use ``bzr remerge`` on particular conflicted files. In future it is planned that ``when-required`` will sign newly
committed revisions only when the branch requires them. ``never`` will refuse
to sign newly committed revisions, even if the branch requires signatures. In most cases, a view has a short life-span: it is created to make
a selected change and is deleted once that change is committed.
At other times, you may wish to create one or more named views
and switch between them. 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 order to calculate those changes, bzr must analyse the submit branch.
Therefore it is most efficient for the submit branch to be a local mirror.
If a public location is known for the submit_branch, that location is used
in the merge directive. 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 that case, ``bzr`` will stop loading the specified plugins and
will raise an import error if they are explicitly imported (by
another plugin that depends on them for example). In the main copy of the file, Bazaar will include all the changes that it
could reconcile, and any un-reconciled conflicts are surrounded by
"herringbone" markers like ``<<<<<<<``. In the shp.net (fictitious) domain, each project has its own site:: In this situation, Bazaar will cancel the move, and leave ``white`` in
``black``. To resolve that kind of conflict, you just have to decide what
name should be retained for the directories involved. 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. Include all possible information. Include the last revision for each file. Include the revision-history. Inconsistency in dirstate file %(dirstate_path)s.
Error: %(description)s InfoHooks
--------- Information on choosing a storage format Information on configuration and log files Information on configuring authentication Information on criss-cross merging Information on defining rule-based preferences Information on end-of-line handling Information on the pattern syntax Information on what a branch is Information on what a checkout is Information on what a standalone tree is Information on working trees Insert claimed random_id=True, but then inserted %r two times Install revisions Instead of merging, show a diff of the merge. Instead of unshelving the changes, show the diff that would result from unshelving. Instead of using:: Integration with Launchpad.net Internally bzr treats all locations as URLs. For any file system paths
that are specified it will automatically determine the appropriate URL
representation, and escape special characters where necessary. Introduced in: %s Introduced in: 0.15 Introduced in: 0.16 Introduced in: 0.91 Introduced in: 1.10 Introduced in: 1.13 Introduced in: 1.14 Introduced in: 1.15 Introduced in: 1.15.0 Introduced in: 1.17 Introduced in: 1.4 Introduced in: 1.6 Introduced in: 1.8 Introduced in: 1.9 Introduced in: 2.0 Introduced in: 2.1 Introduced in: 2.2 Introduced in: 2.3 Introduced in: 2.4 Introduced in: 2.5 Introduced in: 2.6 Introduced in: unknown Introduction
------------ Invalid '%s', should be of the form 'name=value' Invalid URL join request: %(reason)s: %(base)r + %(join_args)r Invalid branch name: %(name)s Invalid bug %s. Must be in the form of 'tracker:id'. See "bzr help bugs" for more information on this feature.
Commit refused. Invalid bug status: '%(status)s' Invalid config value for "{0}" value {1!r} is not an SI unit. Invalid http Content-type "%(ctype)s" for %(path)s: %(msg)s 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 line in bugs property: '%(line)s' Invalid pattern(s) found. %(msg)s Invalid range access in %(path)s at %(offset)s: %(msg)s Invalid record: %(reason)s Invalid revision number %(revno)s Invalid revision-id {%(revision_id)s} in %(branch)s Invalid url supplied to transport: "%(path)s"%(extra)s Inventory ok. Inventory regenerated. Invoked after a repository has been initialised. post_repo_init is
called with a bzrlib.controldir.RepoInitHookParams. Invoked before attempting to open a ControlDir with the transport that
the open will use. Invoked when a config option is read. The signature is (stack, name,
value). Invoked when a config option is removed. The signature is (stack,
name). Invoked when a config option is set. The signature is (stack, name,
value). Invoked when a config store is loaded. The signature is (store). Invoked when a config store is saved. The signature is (store). Invoked when adding information about a revision to the RIO stanza
that is printed. revision is called with a revision object and a RIO
stanza.
Invoked when displaying the statistics for a repository. repository is
called with a statistics dictionary as returned by the repository and
a file-like object to write to. It is a good idea to create a repository whenever you might create more
than one branch of a project. This is true for both working areas where you
are doing the development, and any server areas that you use for hosting
projects. In the latter case, it is common to want branches without working
trees. Since the files in the branch will not be edited directly there is no
need to use up disk space for a working tree. To create a repository in which
the branches will not have working trees pass the '--no-trees' option to
'init-repository'. It is also possible to create a "lightweight" checkout by passing the
--lightweight flag to checkout. A lightweight checkout is even closer to an
SVN checkout in that it is not a first class branch, it mainly consists of the
working tree. This means that any history operations must query the master
branch, which could be slow if a network connection is involved. Also, as you
don't have a local branch, then you cannot commit locally. It is an error to give a tag name that already exists unless you pass
--force, in which case the tag is moved to point to the new revision. It is not possible to losslessly push to %s. You may want to use dpush instead. It is overridden by the BZR_REMOTE_PATH environment variable. It is possible (though very rare) for Bazaar to raise a MalformedTransform
exception. This means that Bazaar encountered a filesystem conflict that it was
unable to resolve. This usually indicates a bug. Please let us know if you
encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs
It sure does!
Keep tags that point to removed revisions. Key %(key)s is already present in map Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by format %(format)r LCA-newness merge. LOCATION is the directory where the config lock is. Launchpad
--------- Launchpad project short name to associate with the branch. Launchpad user ID exists and has SSH keys.
Launchpad user ID set to '%s'.
Launchpad.net provides free Bazaar branch hosting with integrated bug and
specification tracking. Lightweight checkouts work best when you have fast reliable access to the
master branch. This means that if the master branch is on the same disk or LAN
a lightweight checkout will be faster than a heavyweight one for any commands
that modify the revision history (as only one copy of the branch needs to
be updated). Heavyweight checkouts will generally be faster for any command
that uses the history but does not change it, but if the master branch is on
the same disk then there won't be a noticeable difference. Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may be
regular files, symlinks or directories). But it will not include a "main copy"
of the file with herringbone conflict markers. It will appear that the "main
copy" has been renamed to THIS or OTHER. 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 files with conflicts. List ignored files and the patterns that matched them. List paths of files with text conflicts. List shelved changes. List tags. List the branches available at the current location. List the installed plugins. Listen for connections on nominated address. Listen for connections on nominated port. Passing 0 as the port number will result in a dynamically allocated port. The default port depends on the protocol. Local branch is not bound Location
~~~~~~~~ Location aliases
================ Location fo the repository. Location of the Bazaar log file. You can check the current location by
running ``bzr version``. Lock is apparently held, but corrupted: %(corruption_info)s
Use 'bzr break-lock' to clear it Lock not held: %(lock)s Lock owner changed for Lock was broken while still open: %(lock)s - check storage consistency! Lock was released and re-acquired before being broken: %(lock)s: held by %(holder)r, wanted to break %(target)r LockHooks
--------- Log Formats
=========== Log format Log format with one line per revision. Logging revision 0 is invalid. Longer description of the purpose or contents of the branch. Lookup file ids from this tree. Loop involving %(refs)r while expanding "%(string)s". Mail client "%s" does not support specifying body Mail is sent using your preferred mail program. This should be transparent
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
If the preferred client can't be found (or used), your editor will be used. Mail or create a merge-directive for submitting changes. Mail the request to this address. Make %s lock Make a directory into a versioned branch. Malformed bzr revision-bundle header: %(text)r Malformed footer in bzr revision-bundle: %(text)r Malformed hunk header. %(desc)s
%(line)r Malformed line. %(desc)s
%(line)r Malformed patch header. %(desc)s
%(line)r Malformed patches in bzr revision-bundle: %(text)r MalformedTransform
------------------ Manage filtered views. Manually set a commit time using commit date format, e.g. '2009-10-10 08:00:00 +0100'. Many commands that accept URLs also accept location aliases too.
See :doc:`location-alias-help` and :doc:`url-special-chars-help`.
Many different authentication policies can be described in the
``authentication.conf`` file but a particular user should need only a few
definitions to cover his needs without having to specify a user and a password
for every branch he uses. Many of these converters will provide *round-trip* conversion,
i.e. applying the read converter followed by the write converter
gives back the original content. However, others may provide an
asymmetric conversion. For example, a read converter might strip
trailing whitespace off lines in source code while the matching
write converter might pass content through unchanged. Mark a bug as being fixed by this revision (see "bzr help bugs"). Mark a conflict as resolved. Mark the proposal as approved immediately. Marks the conflict as resolved. Merge algorithm Merge even if the destination tree has uncommitted changes. Merge using external diff3. Merge will do its best to combine the changes in two branches, but there
are some kinds of problems only a human can fix. When it encounters those,
it will mark a conflict. A conflict means that you need to fix something,
before you can commit. MergeDirectiveHooks
------------------- MergeHooks
---------- Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562 Message string. Message: %s MessageEditorHooks
------------------ Method to use for writing diffs. Mismatched internal revid {{{0}}} and index revid {{{1}}} Missing feature %(feature)s not provided by this version of Bazaar or any plugin. Missing parent
-------------- Moderately short log format. Move only the bzr identifier of the file, because the file has already been moved. Move or rename a file. Moving %s Moving repository to repository.backup Moving the root directory is not supported at this time Multiple definitions can be provided and, for a given URL, bzr will select a
(``user`` [, ``password``]) based on the following rules : Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects {{{4}}} MutableTreeHooks
---------------- NAME_PATTERN should not be an absolute path Name of the generated function (default: _bzr) Name of the root directory inside the exported file. Name of the view to define, list or delete. Name of the view to switch to. Native diff3-style merge. 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 %(alias_name)s location assigned. No GnuPG key results for pattern: {0} No Launchpad user ID configured.
No WorkingTree exists for "%(base)s". No branch found at specified location. No bundle was found in "%(filename)s". No changes are shelved with id "%(shelf_id)d". No changes are shelved. No changes to commit No changes to commit. Please 'bzr add' the files you want to commit, or use --unchanged to force an empty commit. No compatible object available for operations from %(source)r to %(target)r. No current view to delete No current view to disable No current view.
No error if existing, make parent directories as needed. No files deleted. No final name for trans_id %(trans_id)r
file-id: %(file_id)r
root trans-id: %(root_trans_id)r
No help could be found for '%(topic)s'. Please use 'bzr help topics' to obtain a list of topics. No help for this command. No known version info format {0}. Supported types are: {1} No location could be found to bind to at %(display_url)s. No location specified or remembered No location supplied and no previous location known No location supplied. This format does not remember old locations. No mail-to address (--mail-to) or output (-o) specified. No matching files. No message supplied. No namespace registered for string: %(spec)r No new revisions or tags to push. No new revisions to push. No peer location known or specified. No public branch specified or known 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 repository found at specified location. No repository present: "%(path)s" No review found. No revisions to bundle. No revisions to submit. No revisions to uncommit.
No shelved changes. No submit branch available for branch "%(path)s" No submit branch known or specified No submit branch specified or known No such file: %(path)r%(extra)s No such send format '%s'. No such tag: %(tag_name)s No such view: %(view_name)s. No tag specified to delete. No target configuration specified No template specified. 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 views defined.
No working tree found at specified location. No working tree to remove No working tree. Non-directory parent
-------------------- Not a branch: "%(path)s"%(detail)s. Not a bzr revision-bundle: %(text)r Not currently building a tree. 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 ``basename`` here refers to the base name of ``relpath`` which
itself is defined as the relative path between the section name and the
location it matches. Note that ``exact`` does not imply the file is binary but it does mean
that no conversion of end-of-lines will be done. (Bazaar currently relies
of content analysis to detect binary files for commands like ``diff``.
In the future, a ``binary = true`` rule may be added but it is not
supported yet.) Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these
modifications will be taken into account. Note that the special values 'user', 'core' and 'site' should be
used literally, they will be substituted by the corresponding,
platform specific, values. Note that this is the default action when a single file is involved so you can
simply use:: Note that when merging a directory deletion, if unversioned files are
present, they become potential orphans has they don't have a directory
parent any more. 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 that you must get rid of FILE.moved before using ``--action=done``. Note: As you provide a short name for each tracker, you can specify one or
more bugs in one or more trackers at commit time if you wish. Note: Bazaar's EOL conversion will convert the content of files but
never reject files because a given line ending or mixed line endings
are found. A pre-commit hook should be used if you wish to validate
(and not just convert) content before committing.
Note: Content filtering is only supported in recently added formats,
e.g. 1.14. Be sure that both the repository *and* the branch are
in a recent format. (Just setting the format on the repository
is not enough.) If content filtering does not appear to be working, use
'bzr info -v' to confirm that the branch is using "Working tree format 5"
or later. Note: Export of tree with non-ASCII filenames to zip is not supported. Note: For safety reasons, no conversion is applied to any file where a null
byte is detected in the file. Note: In the future, it is likely that additional options will be added
to commands to make this refreshing process faster and safer.
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. Note: ``bzr commit`` does not implicitly apply write converters after
committing files. If this makes sense for a given plugin providing
a content filter, the plugin can usually achieve this effect by using a
``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`
for more information on hooks. Nothing to delete. Nothing to do. Nothing to merge. Number of levels to display - 0 for all, 1 for flat. OTHER_BRANCH may be local or remote. Obviously to commit on a checkout you need to be able to write to the master
branch. This means that the master branch must be accessible over a writeable
protocol , such as sftp://, and that you have write permissions at the other
end. Checkouts also work on the local file system, so that all that matters is
file permissions. Once converted into a checkout, commits must succeed on the master branch
before they will be applied to the local branch. Once the relevant credentials are declared in this file you may use branch urls
without embedding passwords (security hazard) or even users (enabling sharing
of your urls with others). Once you have fixed a problem, use "bzr resolve" to automatically mark
text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict as
resolved, or "bzr resolve --all" to mark all conflicts as resolved. One-sentence description of the branch. Only ASCII permitted in option names Only display errors and warnings. Only one path may be specified to --auto. Only remove files that have never been committed. Only remove the commits from the local branch when in a checkout. Only show versioned files. Only useful in ``locations.conf``. Defines whether or not the
configuration for this section applies to subdirectories: Open a Launchpad branch page in your web browser. Opening %s in web browser Operation denied because it would change the main history, which is not permitted by the append_revisions_only setting on branch "%(location)s". Option %(name)s is not defined while expanding "%(string)s". Option --change does not accept revision ranges Option policies
^^^^^^^^^^^^^^^ Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value will be saved. Options defined in a section affect the named directory or URL plus
any locations they contain. Policies can be used to change how an
option value is interpreted for contained locations. Currently
there are three policies available: Options that can be used with any command Options that control how Bazaar runs Options to show or record debug information Other Storage Formats Other branch has no new revisions.
Override the default idle client timeout (5min). Override the email id used by Bazaar. Typical format:: Override the home directory used by Bazaar. Override the progress display. Possible values are "none" or "text". If
the value is "none" then no progress bar is displayed. The value "text" draws
the ordinary command line progress bar. Overriding the default site plugin directory:: Overriding the default user plugin directory:: Overwrite tags only. 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. PageFaultCount %8d PagefileUsage %8d KiB Parameter {0!r} encoding is unsupported by {1} application locale. Parent branch already exists: "%(path)s". Parent directory of %s does not exist.
You may supply --create-prefix to create all leading parent directories. Parent loop
----------- Parent not accessible given base "%(base)s" and relative path "%(path)s" Parent of "%s" does not exist. Parents are mismatched between two revisions. %(msg)s Parse error on line %(lineno)d of %(format)s format: %(line)s Pass these options to the external diff program. Patch_type was %(patch_type)s, but no patch was supplied. Path "%(path)s" is not a child of path "%(base)s"%(extra)s Path "%(path)s" is not unicode normalised Path conflict
------------- Path to the Bazaar executable to use when using the bzr+ssh protocol. Path to the editor Bazaar should use for commit messages, etc. Path unknown at end or start of revision range: %s Path(s) are not versioned: %(paths_as_string)s Path(s) do not exist: %(paths_as_string)s%(extra)s Patterns
======== Patterns are ordered and searching stops as soon as one matches.
As a consequence, more explicit patterns should be placed towards
the top of the file. Rule patterns use exactly the same conventions
as ignore patterns. See :doc:`patterns-help` for details. Patterns may also be `Python regular expressions`_. Regular expression
patterns are identified by a ``RE:`` prefix followed by the regular
expression. Regular expression patterns may not include named or
numbered groups. Patterns may include globbing wildcards such as:: 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. PeakPagefileUsage %8d KiB PeakWorking %8d KiB Pending merges must be committed or reverted before using switch. Pending merges need to be committed or reverted before using switch. 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. Perform reconfiguration even if local changes will be lost. Permission denied: "%(path)s"%(extra)s Plaintext diff output. Please specify a tag name. Please specify smtp_server. No server at default %(host)s. Please supply either one revision, or a range. Plugins (including hooks) are run on the server if all of these is true: Plugins specified in this environment variable takes precedence
over the ones in ``BZR_PLUGIN_PATH``. Points at which custom processing can be added Policies are specified by keys with names of the form "<option_name>:policy".
For example, to define the push location for a tree of branches, the
following could be used:: Preferences like these are useful for commands and plugins wishing to
provide custom behaviour for selected files. For more information on
end of line conversion see :doc:`eol-help`.
Keyword support is provided by the `keywords plugin
<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_. Prepare the request but don't actually send it. Preparing file merge Preview patch does not match requested changes. 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. PrivateUsage %8d KiB Produce a strict-format testament. Produce long-format testament. Profile data written to "%s". Propose merging a branch on Launchpad. Propose the merge on staging. Protocol to serve. Public branch "%(public_location)s" lacks revision "%(revstring)s". Push into a different VCS without any custom bzr metadata. Pushed up to revision %d. Pushing to %s Ranges are interpreted differently by different commands. To the "log" command,
a range is a sequence of log messages, but to the "diff" command, the range
denotes a change between revisions (and not a sequence of changes). In
addition, "log" considers a closed range whereas "diff" and "merge" consider it
to be open-ended, that is, they include one end but not the other. For example:
"bzr log -r 3647..3649" shows the messages of revisions 3647, 3648 and 3649,
while "bzr diff -r 3647..3649" includes the changes done in revisions 3648 and
3649, but not 3647. Read converters are only applied to commands that read content from
a working tree, e.g. status, diff and commit. For example, ``bzr diff``
will apply read converters to files in the working tree, then compare
the results to the content last committed. Reading indexes Reading inventory data Received bad protocol version marker: %(marker)r Recipe for importing a tree of files:: Reconcile aborted: revision index has inconsistent parents. Reconcile bzr metadata in a branch. Reconciliation complete. Reconciling branch %s Reconciling repository Reconciling repository %s Reconfigure a branch to be stacked on another branch. Reconfigure a branch to be unstacked. This may require copying substantial data into it. Reconfigure repository to create working trees on branches by default. Reconfigure repository to not create working trees on branches by default. Reconfigure the type of a bzr directory. Reconfigure to be a bound branch with a working tree. Reconfigure to be a lightweight checkout (with no local history). Reconfigure to be a standalone branch (i.e. stop using shared repository). Reconfigure to be an unbound branch with a working tree. Reconfigure to be an unbound branch with no working tree. Reconfigure to use a shared repository. Records
Recurse into subdirectories. Recursively scan for branches rather than just looking in the specified location. Redo a merge. Reduce the scope to the specified configuration file. 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. Refuse to send if there are uncommitted changes in the working tree, --no-strict disables the check. Register a branch with launchpad.net. Related Commands:: Related commands:: Remaining conflicts: Remember submit and public branch. Remember the specified location as a default. Remove a branch. Remove branch even if it is the active branch. Remove files or directories. Remove pending merge marker, without changing any files. Remove the alias. Remove the backup.bzr directory if successful. Remove the last committed revision. Remove the option from the configuration file. Remove the working tree even if it has uncommitted or shelved changes. Remove the working tree from a given branch/checkout. Remove unwanted files from working tree. Removing ancestry.weave Removing backup ... Rename "%(this)s" => "%(other)s"? Replace existing tags. Repositories Repositories are a form of database. Bzr will usually maintain this for
good performance automatically, but in some situations (e.g. when doing
very many commits in a short time period) you may want to ask bzr to
optimise the database indices. This can be done by the 'bzr pack' command. Repositories in Bazaar are where committed information is stored. There is
a repository associated with every branch. Repository %r does not support access to raw revision texts Repository format Repository type Reprocess to reduce spurious conflicts. Requested reconfiguration of '%(display_url)s' is not supported. Requested reviewer and optional type. Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s%(extra)s Requested to stop gracefully Rerun update after fixing the conflicts. Reserved for future use. These options will allow a policy for branches to
require signatures. Reserved revision-id {%(revision_id)s} Resolution pass Resolve all conflicts in this tree. Resolve the conflict preserving the version in the working tree. Resolve the conflict taking the merged version into account. Resolving conflicts is sometimes not obvious. Either because the user that
should resolve them is not the one responsible for their occurrence, as is the
case when merging other people's work or because some conflicts are presented
in a way that is not easy to understand. Restore shelved changes. Reverse the order of revisions. Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s Revision Identifiers Revision is not compatible with %(repo_format)s Revision numbers are always relative to the source branch. Revision {%(revision_id)s} already present in "%(file_id)s". Revision {%(revision_id)s} already present in %(weave)s Revision {%(revision_id)s} not present in "%(file_id)s". Revision {%(revision_id)s} not present in %(weave)s Revisions
Revisions are not derived from the same root: %(revision_a)s %(revision_b)s. Revisions have no common ancestor: %(revision_a)s %(revision_b)s RioVersionInfoBuilderHooks
-------------------------- Root class for inventory serialisation errors Rule Patterns
------------- Rules
===== Rules are defined in ini file format where the sections are file glob
patterns and the contents of each section are the preferences for files
matching that pattern(s). For example:: Run "bzr check" for more details. Run the bzr server. SMTP connection to %(host)s refused SMTP error: %(error)s Same as --mine-only. Same as --theirs-only. Say the initial text is "The project leader released it.", and THIS modifies it
to "Martin Pool released it.", while OTHER modifies it to "The project leader
released Bazaar." A conflict would look like this:: Say yes to all questions. Section headers
^^^^^^^^^^^^^^^ Section local options
^^^^^^^^^^^^^^^^^^^^^ See "bzr help break-lock" for more. See "help revisionspec" for details. See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples. See :doc:`current-formats-help` for the complete list of
currently supported formats. See :doc:`other-formats-help` for
descriptions of any available experimental and deprecated formats.
See ``bzr help patterns`` for details on the syntax of patterns. See ``bzr help resolve`` for more details. See also the ``bzr_remote_path`` configuration option. See also the ``email`` configuration option. See bzr help %s for more details and examples.
See http://doc.bazaar.canonical.com/developers/profiling.html for more
information on profiling. See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
for further information on plugins including where to find them and how to
install them. Instructions are also provided there on how to write new
plugins using the Python programming language. Select a different SSH implementation. Select a particular merge algorithm. Select changes interactively. Select changes introduced by the specified revision. See also "help revisionspec". Select the output format. Selected changes destroyed. Selected changes: Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3. Selected-file commit of merges is not supported yet: files %(files_str)s Serve contents of this directory. Serve on stdin/out for use from inetd or sshd. Server sent an unexpected error: %(error_tuple)r Set a fixed commit message. set_commit_message is called with the
bzrlib.commit.Commit object (so you can also change e.g. revision
properties by editing commit.builder._revprops) and the message so
far. set_commit_message must return the message to use or None if it
should use the message editor as normal. Set files in the working tree back to the contents of a previous revision. 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 the branch of a checkout and update. Set/unset and display aliases. Setting a value is achieved by using name=value without spaces. The value
is set in the most relevant scope and can be checked by displaying the
option again. Setting ssh/sftp usernames for launchpad.net. Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms
will disable logging. Shared repository '%(display_url)s' already creates working trees. Shared repository '%(display_url)s' already doesn't create working trees. Shelf corrupt. Shelve %d change(s)? Shelve adding file "%(path)s"? Shelve all changes. Shelve allows you to temporarily put changes you've made "on the shelf",
ie. out of the way, until a later time when you can bring them back from
the shelf with the 'unshelve' command. The changes are stored alongside
your working tree, and so they aren't propagated along with your branch nor
will they survive its deletion. Shelve binary changes? Shelve changing "%s" from %(other)s to %(this)s? Shelve changing target of "%(path)s" from "%(other)s" to "%(this)s"? Shelve is intended to help separate several sets of changes that have
been inappropriately mingled. If you just want to get rid of all changes
and you don't need to restore them later, use revert. If you want to
shelve all text changes at once, use shelve --all. Shelve removing file "%(path)s"? Shelve renaming "%(other)s" => "%(this)s"? Shelve? Short name for the branch; by default taken from the last component of the url. Show all revisions in addition to the mainline ones. Show annotations on all lines. Show base revision text in conflicts. Show changes made in each revision as a patch. Show changes, but do not apply or remove them. Show commit date in annotations. 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 files to delete instead of deleting them. Show from oldest to newest. Show help message. 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 internal object ids. 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 or set the Launchpad 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 testament (signing-form) of a revision. Show the origin of each line in a file. Show the tree root directory. Show unmerged/unpulled revisions between two branches. Show usage message and options. Show version information about this tree. 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 Sign all commits by a given committer. Signed %d revision.
Signed %d revisions.
Since a lightweight checkout is little more than a working tree
this will refuse to run against one. SmartClientHooks
---------------- SmartServerHooks
---------------- So, to find the merge proposal that reviewed line 1 of README:: Some operations, like merge, revert and pull, modify the contents of your
working tree. These modifications are programmatically generated, and so they
may conflict with the current state of your working tree. Some options are defined automatically inside a given section and can be
referred to in this section only. Some smart servers or protocols *may* put the working tree in place in
the future. Sometimes Bazaar will attempt to create a file using a pathname that has
already been used. The existing file will be renamed to "FILE.moved". Sometimes Bazaar will attempt to create a file whose parent directory is not
versioned. This happens when the directory has been deleted in the target,
but has a new child in the source, or vice versa. In this situation, Bazaar
will version the parent directory as well. Resolving this issue depends
very much on the particular scenario. You may wish to rename or delete either
the file or the directory. When you are satisfied, you can run "bzr resolve
FILE" to mark the conflict as resolved. Sorry, re-merge only works after normal merges. Not cherrypicking or multi-merges. Sort tags by different criteria. Sorting Source branch format does not support stacking, using format:
%s Source repository format does not support stacking, using format:
%s Special character handling in URLs Special character handling in URLs
================================== Specified file "%(file_name)s" is outside the current view: %(view_str)s Specifies the network proxy for outgoing connections, for example:: Specifies which external merge tool (as defined above) should be selected by
default in tools such as ``bzr qconflicts``. Specify a format for this branch. See "help formats". Specify a format for this repository. See "bzr help formats" for details. Split a subdirectory of a tree into a separate tree. Standalone Trees Standard Options Standard options are legal for all commands. Start revision must be older than the end revision. Start revision not found in history of end revision. Status Flags Status flags are used to summarise changes to the working tree in a concise
manner. They are in the form:: StatusHooks
----------- Steps to resolve "out-of-sync" when reconfiguring Still waiting for %d client(s) to finish Storage Formats Subsume target %(other_tree)s needs to be upgraded. Supported URL prefixes:: Supported generic values are: Supported modifiers:: Supported transport protocols Supported values for specific clients: Switch even if local commits will be lost. Switch the checkout in the current directory to the new branch. Switched to branch: %s Tag %(tag_name)s already exists. Tag %s already exists for that revision. Tag conflicts
------------- Tags are stored in the branch. Tags are copied from one branch to another
along when you branch, push, pull or merge. Tags can only be placed on a single revision, not on a range Tags give human-meaningful names to revisions. Commands that take a -r
(--revision) option can be given -rtag:X, where X is any previously
created tag. Tags not supported by %(branch)s; you may be able to use bzr upgrade. Take commit message from this file. Target directory "%s" already exists. Target directory %s already contains a .bzr directory, but it is not valid. Target directory %s already exists, but does not have a .bzr directory. Supply --use-existing-dir to push there anyway. Template for the output. Temporarily set aside some changes from the current tree. Testament did not match expected value.
For revision_id {%(revision_id)s}, expected {%(expected)s}, measured
{%(measured)s} Text conflicts
-------------- Text contents mismatch at line %(line_no)d. Original has "%(orig_line)s", but patch says it should be "%(patch_line)s" Text did not match its checksum: %(msg)s The "%(config_id)s" configuration does not exist. The "%(option_name)s" configuration option does not exist. The %(type)s hook '%(hook)s' is unknown in this version of bzrlib. 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 collocated branches.
The API for "%(api)s" is not compatible with "%(wanted)s". It supports versions "%(minimum)s" to "%(current)s". The Bazaar smart server protocol over TCP. (default port: 4155) The GnuPG user identity to use when signing commits. Can be an e-mail
address, key fingerprint or full key ID. When unset or when set to
"default" Bazaar will use the user e-mail set with ``whoami``. The TREE argument should be a subdirectory of a working tree. That
subdirectory will be converted into an independent tree, with its own
branch. Commits in the top-level tree will not apply to the new subtree. The TREE argument should be an independent tree, inside another tree, but
not part of it. (Such trees can be produced by "bzr split", but also by
running "bzr branch" with the target inside a tree.) The URL for bug tracker "%(abbreviation)s" doesn't contain {id}: %(url)s The ``--fixes`` option allows you to specify a bug tracker and a bug identifier
rather than a full URL. This looks like:: The ``bzr missing`` command is used to find out what revisions are in another
branch that are not present in the current branch, and vice-versa. It shows a
summary of which extra revisions exist in each branch. If you want to see the
precise effects of those revisions, you can use ``bzr diff --old=other_branch``
to show the differences between other_branch and your current branch. The ``password_encoding`` and ``verify_certificates`` fields are recognised but
ignored in the actual implementation.
The ``weave`` merge type is not affected by this problem because it uses
line-origin detection instead of a basis revision to determine the cause of
differences.
The above revision(s) will be removed.
The action to perform. The alias "%(alias_name)s" does not exist. The aliases are:: The authentication configuration file, authentication.conf
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The branch '%(branch)s' is not stacked. The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'. The branch '%(url)s'(%(format)s) is not a stackable format. You will need to upgrade the branch to permit branch stacking. The branch *MUST* be on a listable system such as local disk or sftp. The branch format %(format)s is already at the most recent format. The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH
is not supplied, the remembered submit branch will be used. If no submit
branch is remembered, the development focus will be used. The branch you intend to submit your current work to. This is automatically
set by ``bzr send``, and is also used by the ``submit:`` revision spec. This
should usually be set on a per-branch or per-location basis. The branch {0} has no revision {1}. The bug this branch fixes. The bug this proposal fixes. The bzr client (through the plugin called 'launchpad') has special
features to communicate with Launchpad: The class that contains each hook is given before the hooks it supplies. For
instance, BranchHooks as the class is the hooks class for
`bzrlib.branch.Branch.hooks`. The content being inserted is already present. The conversion between these formats is done by content filters.
A content filter has two parts: The correct resolution would be "Martin Pool released Bazaar." The default behaviour is to send the merge directive by mail, unless -o is
given, in which case it is sent to a file. The default format is ``long``. To change this, define the ``log_format``
setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say):: The default log format to use. Standard log formats are ``long``, ``short``
and ``line``. Additional formats may be provided by plugins. The default
value is ``long``. The definitions found in this file are used to find the credentials to use for
a given url. The same credentials can generally be used for as many branches as
possible by grouping their declaration around the remote servers that need
them. It's even possible to declare credentials that will be used by different
servers. The dirstate file (%(state)s) appears to be corrupt: %(msg)s The email address to use when committing a branch. Typically takes the form
of:: The examples below use ':' as the separator, windows users
should use ';'. The feature %(feature)s has already been registered. The file deletion mode to be used. The file id "%(file_id)s" is not present in the repository %(repository)r The file id "%(file_id)s" is not present in the tree %(tree)s. 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 following are not yet implemented but planned as parts of a work in
progress: The following markers can be used in the command-line to substitute filenames
involved in the merge conflict:: The general rules for :doc:`configuration files <configuration-help>`
apply except for the variable policies. The intent is to make this file as small as possible to minimise maintenance. The inventory was not in the expected format:
%(msg)s The key '%(key)s' is already in index '%(index)s'. The key '%(key)s' is not a valid key. The keywords used as revision selection methods are the following: The levels argument must be an integer. The limit argument must be an integer. The location that commits should go to when acting as a checkout.
This option is normally set by ``bind``. The lock for '%(lock_description)s' is in use and cannot be broken. The log file contains debug information that is useful for diagnosing or
reporting problems with Bazaar. The merge directives created by bzr send may be applied using bzr merge or
bzr pull by specifying a file containing a merge directive as the location. The method %(mname)s is not supported on objects of type %(tname)s. The newest format, 2a, is highly recommended. If your
project is not using 2a, then you should suggest to the
project owner to upgrade. The only valid section headers for bazaar.conf currently are [DEFAULT] and
[ALIASES]. Section headers are case sensitive. The default section provides for
setting options which can be overridden with the branch config file. The options for re-merge have the same meaning and defaults as the ones for
merge. The difference is that re-merge can (only) be run when there is a
pending merge, and it lets you specify particular files. The path %(path)s is not permitted on this platform The path name in the old tree. The path of the editor that you wish to use if *bzr commit* is run without
a commit message. This setting is trumped by the environment variable
``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment
variables. The path to the branch to switch to can be specified relative to the parent
directory of the current branch. For example, if you are currently in a
checkout of /path/to/branch, specifying 'newbranch' will find a branch at
/path/to/newbranch. The path to the plugins directory that Bazaar should use.
If not set, Bazaar will search for plugins in: The path where Bazaar should look for shell plugin external commands. The prefix %(prefix)s is in the help search path twice. The relation between branch and tree. The repository '%(url)s'(%(format)s) is not a stackable format. You will need to upgrade the repository to permit branch stacking. The repository {0} contains no revision {1}. The result is a combined tree, with the subtree no longer an independent
part. This is marked as a merge of the subtree into the containing tree,
and all history is preserved. 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 section name is an arbitrary string, only the ``DEFAULT`` value is reserved
and should appear as the *last* section. The solution is to merge the revisions from the mainline into your local
branch. To do so, use ``bzr merge`` to get the new revisions from the
mainline. This merge may result in conflicts if the other developer's changes
overlap with your changes. These conflicts should be resolved before
continuing. After any conflicts have been resolved, or even if there were no
conflicts, Bazaar requires that you explicitly commit these new revisions
to your local branch. This requirement gives you an opportunity to test the
resulting working tree for correctness, since the merged revisions could have
made arbitrary changes. After testing, you should commit the merge using
``bzr commit``. This clears up the diverged branches situation. Your local
branch can now be pushed to the mainline.
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 specified command must accept the options "--clearsign" and "-u <email>". The specified commit message contains characters unsupported by the current encoding. The submit branch defaults to the parent of the source branch, but can be
overridden. Both submit branch and public branch will be remembered in
branch.conf the first time they are used for a particular branch. The
source branch defaults to that containing the working directory, but can
be changed using --from. The synonyms 'clone' and 'get' for this command are deprecated. The syntax of the file obeys the same rules as the others except for the
option policies which don't apply. The target branch will not have its working tree populated because this
is both expensive and is not supported on remote file systems. The transport '%(transport)s' is only accessible within this process. The tree builder is already building a tree. 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 user aborted the operation. The value '%(value)s' is not a valid value. The variable specified a list of ``plugin_name@plugin path``,
``plugin_name`` being the name of the plugin as it appears in
python module paths, ``plugin_path`` being the path to the
directory containing the plugin code itself
(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list
separator, use ';' on windows. 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 contains a list of revisions that have been merged but
not yet committed. These revisions will be included as additional parents
of the next commit. Normally, using revert clears that list as well as
reverting the files. If any files are specified, revert leaves the list
of uncommitted merges alone and reverts only the files. Use ``bzr revert
.`` in the tree root to revert all files but keep the recorded merges,
and ``bzr revert --forget-merges`` to clear the pending merge list without
reverting any files. The working tree for %(basedir)s has changed since the last commit, but weave merge requires that it be unchanged There are a few characters which have special meaning in URLs and need careful
handling to avoid ambiguities. Characters can be escaped with a % and a hex
value in URLs. Any non-ASCII characters in a file path will automatically be
urlencoded when the path is converted to a URL. There are three primary configuration files in this location: There are two kinds of authentication used by the various schemes supported by
bzr: There are two possible values for this option: There is already a branch merge proposal: %s There is no public branch set for "%(branch_url)s". Therefore simply saying 'bzr add' will version all files that
are currently unknown. These are produced when a text merge cannot completely reconcile two sets of
text changes. Bazaar will emit files for each version with the extensions
THIS, OTHER, and BASE. THIS is the version of the file from the target tree,
i.e. the tree that you are merging changes into. OTHER is the version that you
are merging into the target. BASE is an older version that is used as a basis
for comparison. These are valid but do not refer to the same file:: These branches have diverged. See "bzr help diverged-branches" for more information. These branches have diverged. Try merging, and then bind again. These branches have diverged. Use the missing command to see how.
Use the merge command to reconcile them. These flags can be passed on the bzr command line or (without the ``-D``
prefix) put in the ``debug_flags`` variable in ``bazaar.conf``. These options apply only to branches that use the ``dirstate-tags`` or
later format. They
are usually set in ``.bzr/branch/branch.conf`` automatically, but may be
manually set in ``locations.conf`` or ``bazaar.conf``. These options may be used with any command, and may appear in front of any
command. (e.g. ``bzr --profile help``). 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 breaks a lock on a repository, branch, working directory or
config file. 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 generates a shell function which can be used by bash to
automatically complete the currently typed command when the user presses
the completion key (usually tab). This command lists a bzr branch in the directory of branches on
launchpad.net. Registration allows the branch to be associated with
bugs or specifications. 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 requires the target tree to be in a rich-root format. This command shows a table of tag names and the revisions they reference. This command will print the names of all the branches at the current
location. This command will produce a target tree in a format that supports
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
converted into earlier formats like 'dirstate-tags'. This command will show all known locations and formats associated to the
tree, branch or repository. This conflict happens when there are conflicting changes in the working tree
and the merge source, but the conflicted items are not text files. They may
be binary files, or symlinks, or directories. It can even happen with files
that are deleted on one side, and modified on the other. This does not sign commits that already have signatures. This happens when a directory has been deleted in the target, but has new
children in the source. This is similar to the "unversioned parent" conflict,
except that the parent directory does not *exist*, instead of just being
unversioned. In this situation, Bazaar will create the missing parent.
Resolving this issue depends very much on the particular scenario. This happens when one side has added files to a directory, and the other side
has changed the directory into a file or symlink. For example:: This happens when the source and target have each modified the name or parent
directory of a file. Bazaar will use the path elements from the source. This happens when the source and the target have each moved directories, so
that, if the change could be applied, a directory would be contained by itself.
For example:: This is a checkout. The branch (%s) needs to be upgraded separately. This is equal to the number of revisions on this branch. This is equivalent to creating the directory and then adding it. This is the opposite of "missing parent". A directory is deleted in the
source, but has new children in the target (either because a directory
deletion is merged or because the merge introduce new children). Bazaar
will retain the directory. Resolving this issue depends very much on the
particular scenario. 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 operation requires rich root data storage This prints out the given file with an annotation on the left side
indicating which revision, author and date introduced the change. This reports on versioned and unknown files, reporting them
grouped by state. Possible states are: This situation commonly arises when using a centralised workflow with local
commits. If someone else has committed new work to the mainline since your
last pull and you have local commits that have not yet been pushed to the
mainline, then your local branch and the mainline have diverged. This tree contains left-over files from a failed operation.
Please examine %(limbo_dir)s to see if it contains any files you wish to
keep, and delete it when you are done. This tree contains left-over files from a failed operation.
Please examine %(pending_deletion)s to see if it contains any files you
wish to keep, and delete it when you are done. This will afterwards rebase the local branch on the remote
branch unless the --no-rebase option is used, in which case
the two branches will be out of sync after the push. This will open your usual editor to provide the initial comment. When it
has created the proposal, it will open it in your default web browser. 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. This will propose a merge, request "jrandom" to perform a review of
unspecified type, and request "review-team" to perform a "qa" review. This will remove the branch from the specified location but
will keep any working tree or repository in place. Tip change rejected: %(msg)s To check what clean-tree will do, use --dry-run. To compare the working directory to a specific revision, pass a
single revision to the revision argument. To configure which files to filter, set ``eol`` to one of the values below.
(If a value is not set, ``exact`` is the default.) To create a shared repository use the init-repository command (or the alias
init-repo). This command takes the location of the repository to create. This
means that 'bzr init-repository repo' will create a directory named 'repo',
which contains a shared repository. Any new branches that are created in this
directory will then use it for storage. To disable the current view without deleting it, you can switch to
the pseudo view called ``off``. This can be useful when you need
to see the whole tree for an operation or two (e.g. merge) but
want to switch back to your view after that. To ensure that older clients do not access data incorrectly,
Bazaar's policy is to introduce a new storage format whenever
new features requiring new metadata are added. New storage
formats may also be introduced to improve performance and
scalability. To filter on a range of revisions, you can use the command -r begin..end
-r revision requests a specific revision, -r ..end or -r begin.. are
also valid.
:Exit values:
1 - some missing revisions
0 - no missing revisions To generalise, there are two content formats supported by Bazaar: 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 only some changes, without reverting to a prior version, use
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
will remove the changes introduced by the second last commit (-2), without
affecting the changes introduced by the last commit (-1). To remove
certain changes on a hunk-by-hunk basis, see the shelve command.
To update the branch to a specific revision or the latest revision and
update the working tree accordingly while preserving local changes, see the
update command. 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 rename a tag (change the name but keep it on the same revsion), run ``bzr
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``. To resolve that kind of conflict, you have to decide what name should be
retained for the file, directory or symlink involved. To resolve that kind of conflict, you just have to decide what name should be
retained for the file involved. To resolve that kind of conflict, you should either remove or rename the
children or the directory or a combination of both. To resolve that kind of conflict, you should rebuild FILE from either version
or a combination of both. To resolve the conflict, you must apply the correct tags to either the target
branch or the source branch as appropriate. Use "bzr tags --show-ids -d
SOURCE_URL" to see the tags in the source branch. If you want to make the
target branch's tags match the source branch, then in the target branch do
``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the
CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the source
branch. You need not call "bzr resolve" after doing this. To resolve in
favor of the target branch, you need to similarly use ``tag --force`` in the
source branch. (Note that pulling or pushing using --overwrite will overwrite
all tags as well.) 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". To take all schemes into account, the password will be deduced from a set of
authentication definitions (``scheme``, ``host``, ``port``, ``path``, ``user``,
``password``). To use a specific mail program, set the mail_client configuration option.
(For Thunderbird 1.5, this works around some bugs.) Supported values for
specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
Mail.app), "mutt", and "thunderbird"; generic options are "default",
"editor", "emacsclient", "mapi", and "xdg-email". Plugins may also add
supported clients. To use this feature you must upgrade your branch at %(path)s to a format which supports rich roots. To use this feature you must upgrade your branch at %(path)s. To use this feature you must upgrade your repository at %(path)s. Too many redirections Too many redirections trying to make %s. Topics list Trailing slashes on patterns are ignored. If the pattern contains a
slash or is a regular expression, it is compared to the whole path
from the branch root. Otherwise, it is compared to only the last
component of the path. To match a file only in the root directory,
prepend ``./``. Patterns specifying absolute paths are not allowed. Transferring revisions Transport error: %(msg)s %(orig_error)s Transport operation not possible: %(msg)s %(orig_error)s TransportHooks
-------------- Tree is up to date at revision %d. Tree is up to date at revision {0} of branch {1} Tree type Trees in Repository Turn this branch into a mirror of another branch. Two formats are currently supported: "4" uses revision bundle format 4 and
merge directive format 2. It is significantly faster and smaller than
older formats. It is compatible with Bazaar 0.19 and later. It is the
default. "0.9" uses revision bundle format 0.9 and merge directive
format 1. It is compatible with Bazaar 0.12 - 0.18. Type of file to export to. Types of conflicts and what to do about them Typical message:: URL Identifiers URLs differ by more than path: %(from_)r and %(to)r URLs represent non-ASCII characters in an encoding defined by the server, but
usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to be
generous in what it accepts as a URL and to print them in a way that
will be readable. Unable to connect to current master branch %(target)s: %(error)s To switch anyway, use --force. Unable to connect to target of bound branch %(branch)s => %(target)s: %(error)s Unable to create symlink %(path_str)son this platform Unable to delete transform temporary directory %(limbo_dir)s.
Please examine %(limbo_dir)s to see if it contains any files you wish to
keep, and delete it when you are done. Unable to delete transform temporary directory %(pending_deletion)s. Please examine %(pending_deletion)s to see if it contains any files you wish to keep, and delete it when you are done. Unable to determine your name.
Please, set your name with the 'whoami' command.
E.g. bzr whoami "Your Name <name@example.com>" Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s Unable to find mail client with the following names: %(mail_command_list_string)s Unable to handle bundle version %(version)s: %(msg)s Unable to import library "%(library)s": %(error)s Unable to import paramiko (required for sftp support): %(error)s Unable to obtain Uncommit leaves the working tree ready for a new commit. The only change
it may make is to restore any pending merges that were present before
the commit. Uncommit these revisions Uncommitted changes to files that are reverted will be discarded.
Howver, by default, any files that have been manually changed will be
backed up first. (Files changed only by merge are not backed up.) Backup
files have '.~#~' appended to their name, where # is a number. Under special circumstances (mostly when trying to diagnose a
bug), it's better to disable a plugin (or several) rather than
uninstalling them completely. Such plugins can be specified in
the ``BZR_DISABLE_PLUGINS`` environment variable. Unexpected end of container stream Unknown %(kind)s format: %(format)r Unknown key {0} signed {1} commit Unknown key {0} signed {1} commits Unknown record type: %(record_type)r Unknown rules detected: %(unknowns_str)s. Unlike global options, standard options can be used in aliases.
Unrecognised container format: %(container_format)r Unrecognised value for BZR_SSH environment variable: %(vendor)s Unrecognised bug %s. Commit refused. Unstacking Unsupported branch format: %(format)s
Please run 'bzr upgrade' Unsupported entry kind %(kind)s Unsupported export format: %s Unsupported protocol for url "%(path)s"%(extra)s Unsupported timezone format "%(timezone)s", options are "utc", "original", "local". Unversioned parent
------------------ Update a mirror of this branch. Update a working tree to a new revision. Updated tag %s. Updated to revision %d. Updated to revision {0} of branch {1} Upgrade URL cannot work with readonly URLs. Upgrade a repository, branch or working tree to a newer format. Upgrade to a specific format. See "bzr help formats" for details. Upgrading %s Upgrading branch Upgrading bzrdirs Upgrading repository Upgrading working tree Upgrading {0} {1} ... Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2. Use an ASCII NUL (\0) separator rather than a newline. Use bzr resolve when you have fixed a problem. Use bzr resolve when you have fixed a problem. See also bzr conflicts. Use short status indicators. Use specified log format. Use the specified output format. 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 re-merge
lets you try different ones on different files. Use this to create an empty branch, or before importing an
existing project. Useful commands:: User and password to authenticate to the SMTP server. If smtp_username
is set, and smtp_password is not, Bazaar will prompt for a password.
These settings are only needed if the SMTP server requires authentication
to send mail. Using "bzr revert --forget-merges", it is possible to apply all of the
changes from a branch in a single revision. To do this, perform the merge
as desired. Then doing revert with the "--forget-merges" option will keep
the content of the tree as it was, but it will clear the list of pending
merges. The next commit will then contain all of the changes that are
present in the other branch, but without any other parent revisions.
Because this technique forgets where these changes originated, it may
cause additional conflicts on later merges involving the same source and
target branches. Using '{0}' view: {1}
Using Bazaar with Launchpad.net Using ``relpath`` to achieve the same result is done like this:: Using a specific version of ``myplugin``:
``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin`` Using changes with id "%d". Using default stacking branch {0} at {1} Using saved location: %s
Using saved parent location: %s
Using saved parent location: {0}
Using saved push location: %s Using saved {0} location "{1}" to determine what changes to submit. Using shared repository: %s
Using {0} {1} VFS requests over the smart server are not allowed. Encountered: %(method)s, %(arguments)s. Valid values: Validate working tree structure, branch consistency and repository history. Variable {%(name)s} is not available. Various actions are available depending on the kind of conflict, for some of
these actions, Bazaar can provide some help. In the end you should at least
inform Bazaar that you're done with the conflict with:: Verifies that all commits in the branch are signed by known GnuPG keys. Verify all commit signatures. Version info in Custom template-based format. Version info in Python format. Version info in RIO (simple text) format (default). Versioned file error Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree to a later format. Views defined:
Views provide a mask over the tree so that users can focus on
a subset of a tree when doing their work. After creating a view,
commands that support a list of files - status, diff, commit, etc -
effectively have that list of files implicitly given each time.
An explicit list of files can still be given but those files
must be within the current view. Waiting for %d client(s) to finish Walking content 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.
Weave invariant violated: %(what)s Weave-based merge. Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, %(weave_b)s What names to list as authors - first, all or committer. Whatever the conflict is, resolving it is roughly done in two steps: When Bazaar generates a conflict, it adds information into the working tree to
present the conflicting versions, and it's up to you to find the correct
resolution. When Bazaar tries to push one branch onto another, it requires that the
destination branch must be ready to receive the source branch. If this isn't
the case, then we say that the branches have ``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. To recover
from diverged branches, one must merge the missing revisions into the source
branch. When adding a new feature or working on a bug in a plugin,
developers often need to use a specific version of a given
plugin. Since python requires that the directory containing the
code is named like the plugin itself this make it impossible to
use arbitrary directory names (using a two-level directory scheme
is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even
if they don't appear in ``BZR_PLUGIN_PATH`` . When an option is local to a Section, it cannot be referred to from option
values in any other section from the same ``Store`` nor from any other
``Store``. When committing to a foreign version control system do not push data that can not be natively represented. When communicating with Launchpad, some commands need to know your
Launchpad user ID. This command can be used to set or show the
user ID that Bazaar will use for such communication. When conflicts are present in your working tree (as shown by ``bzr
conflicts``), you should resolve them and then inform bzr that the conflicts
have been resolved. When making a commit, metadata about bugs fixed by that change can be
recorded by using the ``--fixes`` option. For each bug marked as fixed, an
entry is included in the 'bugs' revision property stating '<url> <status>'.
(The only ``status`` value currently supported is ``fixed.``) 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 pulling from or pushing to another branch, Bazaar informs you about tags
that conflict between the two branches; that is the same tag points to two
different revisions. You need not resolve these conflicts, but subsequent
uses of pull or push will result in the same message. When reconfiguring a checkout, tree or branch into a lightweight checkout,
a local branch must be destroyed. (For checkouts, this is the local branch
that serves primarily as a cache.) If the branch-to-be-destroyed does not
have the same last revision as the new reference branch for the lightweight
checkout, data could be lost, so Bazaar refuses. When the conflict is resolved, Bazaar deletes the previously generated
``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the
working tree. 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 two branches of the same project share a repository, there is
generally a large space saving. For some operations (e.g. branching
within the repository) this translates in to a large time saving. When used in a directory like
``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get:: When used with a colocated branch named ``832013-expand-in-stack``, we'll get:: When you have resolved text conflicts, just run ``bzr resolve --auto``, and
Bazaar will auto-detect which conflicts you have resolved. 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. When you push a branch to a remote system, a working tree will not be
created. If one is already present the files will not be updated. The
branch information will be updated and the working tree will be marked
as out-of-date. Updating a working tree remotely is difficult, as there
may be uncommitted changes or the update may cause content conflicts that are
difficult to deal with remotely. Whether new branches in the repository have trees. While most configuration is handled by configuration files, some options
which may be semi-permanent can also be controlled through the environment. Will continue to try until %s, unless you press Ctrl-C. With this configuration, the push location for ``/top/location/branch1``
would be ``sftp://example.com/location/branch1``. Working Trees Working tree "%(display_url)s" has shelved changes (See bzr shelve --list).%(more)s Working tree "%(display_url)s" has uncommitted changes (See bzr status).%(more)s Working tree has conflicts. Working tree is out of date, please run 'bzr update'.%(more)s WorkingSize %8d KiB WorkingSize {0:>7}KiB PeakWorking {1:>7}KiB {2} Write converters are only applied by commands that **create files in a
working tree**, e.g. branch, checkout, update. If you wish to see the
canonical format of a file or tree, use ``bzr cat`` or ``bzr export``
respectively. Write merge directive to this file or directory; use - for stdout. Write the contents of a file as of a given revision to standard output. Writing weave Yet, whether Bazaar makes a choice or not, there are some other simple but
different ways to resolve the conflict. You are missing %d revision:
You are missing %d revisions:
You can change the master of a checkout by using the "switch" command (see
"help switch"). This will change the location that the commits are sent to.
The "bind" command can also be used to turn a normal branch into a heavy
checkout. If you would like to convert your heavy checkout into a normal
branch so that every commit is local, you can use the "unbind" command. To see
whether or not a branch is bound or not you can use the "info" command. If the
branch is bound it will tell you the location of the bound branch. You can get information on what locks are open via the 'bzr info
[location]' command. You can handle text conflicts either by editing the main copy of the file,
or by invoking external tools on the THIS, OTHER and BASE versions. It's
worth mentioning that resolving text conflicts rarely involves picking one
set of changes over the other (but see below when you encounter these
cases). More often, the two sets of changes must be intelligently combined. You can only supply one of revision_id or --revision You can put multiple items on the shelf, and by default, 'unshelve' will
restore the most recently shelved changes. You can restore the old tip by running:
bzr pull . -r revid:%s
You can use this command to add information about version into
source code of an application. The output can be in one of the
supported formats or in a custom format based on a template. 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 have %d extra revision:
You have %d extra revisions:
You must supply either --revision or a revision_id You must supply either a revision or a location Your branch does not have all of the revisions required in order to merge this merge directive and the target location specified in the merge directive is not a branch: %(location)s. Your local commits will now show as pending merges with 'bzr status', and can be committed with 'bzr commit'. _ConfigHooks
------------ _`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3) ``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``
``SFTP`` can use either a password or a host key to authenticate. However,
ssh agents are a better, more secure solution. So we have chosen to not provide
our own less secure method. ``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly
specifying the appropriate port. ``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate
against a host. But, by using ``.htaccess`` files, for example, it is possible
to define several (``user, realm, password``) for a given ``host``. So what is
really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` is
not taken into account in the definitions, but will displayed if bzr prompts
you for a password. ``authentication.conf`` allows one to specify credentials for
remote servers. This can be used for all the supported transports and any part
of bzr that requires authentication (smtp for example). ``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.
The default section contains the default
configuration options for all branches. The default section can be
overridden by providing a branch-specific section in ``locations.conf``. ``bzr resolve`` recognises the following actions: ``locations.conf`` allows one to specify overriding settings for
a specific branch. The format is almost identical to the default section in
bazaar.conf with one significant change: The section header, instead of saying
default, will be the path to a branch that you wish to override a value
for. The '?' and '*' wildcards are supported:: `bzr send` creates a compact data set that, when applied using bzr
merge, has the same effect as merging from the source branch. action add Add specified files or directories.
alias Set/unset and display aliases.
annotate Show the origin of each line in a file.
bash-completion Generate a shell function for bash command line completion.
[bash_completion]
bind Convert the current branch into a checkout of the supplied
branch.
branch Create a new branch that is a copy of an existing branch.
branches List the branches available at the current location.
break-lock Break a dead lock.
cat Write the contents of a file as of a given revision to
standard output.
check Validate working tree structure, branch consistency and
repository history.
checkout Create a new checkout of an existing branch.
clean-tree Remove unwanted files from working tree.
commit Commit changes into a new revision.
config Display, set or remove a configuration option.
conflicts List files with conflicts.
deleted List files deleted in the working tree.
diff Show differences in the working tree, between revisions or
branches.
dpush Push into a different VCS without any custom bzr metadata.
export Export current or past revision to a destination directory or
archive.
help Show help on a command or other topic.
ignore Ignore specified files or patterns.
ignored List ignored files and the patterns that matched them.
info Show information about a working tree, branch or repository.
init Make a directory into a versioned branch.
init-repository Create a shared repository for branches to share storage
space.
join Combine a tree into its containing tree.
launchpad-login Show or set the Launchpad user ID. [launchpad]
launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]
launchpad-open Open a Launchpad branch page in your web browser. [launchpad]
log Show historical log for a branch or subset of a branch.
lp-find-proposal Find the proposal to merge this revision. [launchpad]
lp-propose-merge Propose merging a branch on Launchpad. [launchpad]
ls List files in a tree.
merge Perform a three-way merge.
missing Show unmerged/unpulled revisions between two branches.
mkdir Create a new versioned directory.
mv Move or rename a file.
nick Print or set the branch nickname.
pack Compress the data within a repository.
plugins List the installed plugins.
pull Turn this branch into a mirror of another branch.
push Update a mirror of this branch.
reconcile Reconcile bzr metadata in a branch.
reconfigure Reconfigure the type of a bzr directory.
register-branch Register a branch with launchpad.net. [launchpad]
remerge Redo a merge.
remove Remove files or directories.
remove-branch Remove a branch.
remove-tree Remove the working tree from a given branch/checkout.
renames Show list of renamed files.
resolve Mark a conflict as resolved.
revert Set files in the working tree back to the contents of a
previous revision.
revno Show current revision number.
root Show the tree root directory.
send Mail or create a merge-directive for submitting changes.
serve Run the bzr server.
shelve Temporarily set aside some changes from the current tree.
sign-my-commits Sign all commits by a given committer.
split Split a subdirectory of a tree into a separate tree.
status Display status summary.
switch Set the branch of a checkout and update.
tag Create, remove or modify a tag naming a revision.
tags List tags.
testament Show testament (signing-form) of a revision.
unbind Convert the current checkout into a regular branch.
uncommit Remove the last committed revision.
unshelve Restore shelved changes.
update Update a working tree to a new revision.
upgrade Upgrade a repository, branch or working tree to a newer
format.
verify-signatures Verify all commit signatures.
version Show version of bzr.
version-info Show version information about this tree.
view Manage filtered views.
whoami Show or set bzr user id.
add.maximum_file_size
~~~~~~~~~~~~~~~~~~~~~ added added
Versioned in the working copy but not in the previous revision. added List files added in working tree.
ancestry List all revisions merged into this branch.
assert-fail Test reporting of assertion failures
bundle-info Output interesting stats about a bundle
bundle-revisions Create a merge-directive for submitting changes.
cat-revision Write out metadata for a revision.
dump-btree Dump the contents of a btree index file to stdout.
export-pot Export command helps and error messages in po format.
file-id Print file_id of a particular file or directory.
file-path Print path of file_ids to a file or directory.
find-merge-base Find and print a base revision for merging two branches.
hooks Show hooks.
inventory Show inventory of the current working copy or a revision.
local-time-offset Show the offset in seconds from GMT to local time.
lookup-revision Lookup the revision-id from a revision-number
merge-directive Generate a merge directive for auto-merge tools.
modified List files modified in working tree.
re-sign Create a digital signature for an existing revision.
reference list, view and set branch locations for nested trees.
relpath Show path of a file relative to root
repair-workingtree Reset the working tree state file.
revision-history Display the list of revision ids on a branch.
revision-info Show revision number and revision id for a given revision
identifier.
rocks Statement of optimism.
selftest Run internal test suite.
shell-complete Show appropriate completions for context.
test-script Run a shell-like test from a file.
touching-revisions Return revision-ids which affected a particular file.
unknowns List unknown files.
wait-until-signalled Test helper for
test_start_and_stop_bzr_subprocess_send_signal.
added %s
adding file adding prefixes to %s allowing URLs such as:: always
Sign every new revision that is committed. If the signing fails then the
commit will not be made. annotating append_revisions_only
~~~~~~~~~~~~~~~~~~~~~ arguments:
public_url: The publicly visible url for the branch to register.
This must be an http or https url (which Launchpad can read
from to access the branch). Local file urls, SFTP urls, and
bzr+ssh urls will not work.
If no public_url is provided, bzr will use the configured
public_url if there is one for the current branch, and
otherwise error. authentication Information on configuring authentication
basic Basic commands
branches Information on what a branch is
bugs Bug tracker settings
checkouts Information on what a checkout is
commands Basic help for all commands
configuration Details on the configuration settings available
conflict-types Types of conflicts and what to do about them
content-filters Conversion of content into/from working trees
criss-cross Information on criss-cross merging
current-formats Current storage formats
debug-flags Options to show or record debug information
diverged-branches How to fix diverged branches
env-variables Environment variable names and values
eol Information on end-of-line handling
files Information on configuration and log files
formats Information on choosing a storage format
global-options Options that control how Bazaar runs
hidden-commands All hidden commands
hooks Points at which custom processing can be added
launchpad Using Bazaar with Launchpad.net
location-alias Aliases for remembered locations
log-formats Details on the logging formats available
other-formats Experimental and deprecated storage formats
patterns Information on the pattern syntax
repositories Basic information on shared repositories.
revisionspec Explain how to use --revision
rules Information on defining rule-based preferences
standalone-trees Information on what a standalone tree is
standard-options Options that can be used with any command
status-flags Help on status flags
sync-for-reconfigure Steps to resolve "out-of-sync" when reconfiguring
topics Topics list
url-special-chars Special character handling in URLs
urlspec Supported transport protocols
working-trees Information on working trees
automatic_tag_name
~~~~~~~~~~~~~~~~~~ bound
~~~~~ bound_location
~~~~~~~~~~~~~~ branch has no revision %s
bzr update --revision only works for a revision in the branch history bugtracker_<tracker>_url
------------------------ bugzilla_<tracker>_url
---------------------- 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 merge-directive takes at most two one revision identifiers bzr send makes extensive use of public locations to map local locations into
URLs that can be used by other people. See `bzr help configuration` to
set them, and use `bzr info` to display them. bzr send takes at most two one revision identifiers 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 bzr version-info --revision takes exactly one revision specifier bzr.default_mergetool
~~~~~~~~~~~~~~~~~~~~~ bzr.mergetool.<name>
~~~~~~~~~~~~~~~~~~~~ bzr: ERROR (ignored): %s bzr_remote_path
~~~~~~~~~~~~~~~ call
~~~~ can not move root of branch cannot create branch without source branch cannot specify both --from-root and PATH cannot upgrade from bzrdir format %s check check-available
(default) If gnupg signatures for revisions are present, check them.
Bazaar will fail if it finds a bad signature, but will not fail if
no signature is present. check_signatures
~~~~~~~~~~~~~~~~ checked branch {0} format {1} checked repository {0} format {1} checking branches and trees checking commit contents checking file graphs checking revisions checking text graph command {0!r} needs one or more {1} command {0!r} requires argument {1} commit_message_template
~~~~~~~~~~~~~~~~~~~~~~~ committers:
%s
converting revision create_signatures
~~~~~~~~~~~~~~~~~ debug_flags
~~~~~~~~~~~ default_format
~~~~~~~~~~~~~~ deleted %s deleting paths: development focus %s has no branch. dirstate.fdatasync
~~~~~~~~~~~~~~~~~~ dpush_strict
~~~~~~~~~~~~ editor
~~~~~~ email
~~~~~ error removing pending lock: %s example:
bzr register-branch http://foo.com/bzr/fooproject.mine \
--project fooproject extend_command
~~~~~~~~~~~~~~ extra argument to command {0}: {1} failed to clean-up {0}: {1} failed to reset the tree state{0} false
This section only applies to the branch at this directory and not
branches below it. finished fixes bug fixes bugs format found error:%s get
~~~ get_command
~~~~~~~~~~~ get_missing_command
~~~~~~~~~~~~~~~~~~~ gpg_signing_command
~~~~~~~~~~~~~~~~~~~ gpg_signing_key
~~~~~~~~~~~~~~~ held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s ignore
Do not check gnupg signatures of revisions. ignore requires at least one NAME_PATTERN or --default-rules. ignored {0} matching "{1}"
invalid direction %r invalid kind %r specified invalid kind specified inventories inventory kind changed
File kind has been changed (e.g. from file to directory). list_commands
~~~~~~~~~~~~~ listening on port: %s listening socket error: %s load
~~~~ loading revision loading text store lock_acquired
~~~~~~~~~~~~~ lock_broken
~~~~~~~~~~~ lock_released
~~~~~~~~~~~~~ locks.steal_dead
~~~~~~~~~~~~~~~~ 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:: log_format
~~~~~~~~~~ lstat/stat of ({0!r}): {1!r} mail_client
~~~~~~~~~~~ making backup of {0}
to {1} 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. merge_file_content
~~~~~~~~~~~~~~~~~~ merge_request_body
~~~~~~~~~~~~~~~~~~ merger: missing %s missing file argument modified modified
Text has changed since the previous revision. never
Reserved for future use. nicks: %s
not a valid revision-number: %r note: upgrade may be faster if all store files are ungzipped first open
~~~~ or:: output_encoding
~~~~~~~~~~~~~~~ parent_location
~~~~~~~~~~~~~~~ pb parameter to convert() is deprecated please specify a commit message with either --message or --file please specify either --message or --file post_branch_init
~~~~~~~~~~~~~~~~ post_build_tree
~~~~~~~~~~~~~~~ post_change_branch_tip
~~~~~~~~~~~~~~~~~~~~~~ post_command
~~~~~~~~~~~~ post_commit
~~~~~~~~~~~ post_connect
~~~~~~~~~~~~ post_merge
~~~~~~~~~~ post_pull
~~~~~~~~~ post_push
~~~~~~~~~ post_repo_init
~~~~~~~~~~~~~~ post_status
~~~~~~~~~~~ post_switch
~~~~~~~~~~~ post_transform
~~~~~~~~~~~~~~ post_uncommit
~~~~~~~~~~~~~ pre_change_branch_tip
~~~~~~~~~~~~~~~~~~~~~ pre_command
~~~~~~~~~~~ pre_commit
~~~~~~~~~~ pre_merge
~~~~~~~~~ pre_open
~~~~~~~~ pre_status
~~~~~~~~~~ pre_transform
~~~~~~~~~~~~~ protocol provided you have created the following ``authentication.conf`` file:: public_branch
~~~~~~~~~~~~~ push_location
~~~~~~~~~~~~~ push_strict
~~~~~~~~~~~ python-gpgme is not installed, it is needed to verify signatures recurse
~~~~~~~ register-branch requires a public branch url - see bzr help register-branch. remove
~~~~~~ removed
Versioned in the previous revision but removed or deleted
in the working copy. removing file renamed renamed
Path of this file changed from the previous revision;
the text may also have changed. This includes files whose
parent directory was renamed. renamed {0} to {1} 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. repository
~~~~~~~~~~ repository converted repository.fdatasync
~~~~~~~~~~~~~~~~~~~~ require
The gnupg signature for revisions must be present and must be valid. resolution for {0}
local: {1}
remote: {2} revision
~~~~~~~~ revision {%s} not present in branch; will be converted as a ghost revision_history ok. revisions
This is just the number of revisions checked. It doesn't
indicate a problem. save
~~~~ send_strict
~~~~~~~~~~~ server_exception
~~~~~~~~~~~~~~~~ server_started
~~~~~~~~~~~~~~ server_started_ex
~~~~~~~~~~~~~~~~~ server_stopped
~~~~~~~~~~~~~~ set
~~~ set_commit_message
~~~~~~~~~~~~~~~~~~ skipping {0} (larger than {1} of {2} bytes) smtp_server
~~~~~~~~~~~ smtp_username, smtp_password
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sorry, %r not allowed in path source package %s has no branch. start_commit
~~~~~~~~~~~~ starting repository conversion starting upgrade from format 4 to 5 starting upgrade from format 5 to 6 starting upgrade from format 6 to metadir starting upgrade of %s submit_branch
~~~~~~~~~~~~~ subunit not available. subunit needs to be installed to use --subunit. suppress_warnings
~~~~~~~~~~~~~~~~~ texts to mv multiple files the destination must be a versioned directory trac_<tracker>_url
------------------ transform_fallback_location
~~~~~~~~~~~~~~~~~~~~~~~~~~~ true
(default) This section applies to subdirectories as well. unable to remove "{0}": {1}. unable to remove %s unchanged unique file texts
This is the total number of unique file contents
seen in the checked revisions. It does not indicate a problem. unique files: %d
unknown
Not versioned and not matching an ignore pattern. unknown command "%s" unknown log formatter: %r 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. unreferenced version: {{{0}}} in {1} upgraded to weaves: versionedfiles
This is just the number of versionedfiles checked. It
doesn't indicate a problem. when-required
Reserved for future use. where "<tracker>" is an identifier for the bug tracker, and "<id>" is the
identifier for that bug within the bugtracker, usually the bug number.
If "<tracker>" is not specified the ``bugtracker`` set in the branch
or global configuration is used. where @new_path is replaced with the path of the new version of the
file and @old_path is replaced with the path of the old version of
the file. The PROGRAM should save the new file with the desired
contents of the file in the working tree.
where the columns' meanings are as follows. will produce a C header file with formatted string containing the
current revision number. Other supported variables in templates are: would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's
RT bug tracker as fixed, or:: would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-1234
in Hudson's JIRA bug tracker as fixed.
would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's
Roundup bug tracker as fixed, or:: would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as
fixed. would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 as
fixed. would refer to ``/home/remote/myproject/trunk``. write revision writer writing weave you simply use:: {0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use regular push. {0!r} is not present in revision {1} {0!r} was {1} locked again {0} => {1} {0} [{1}] - Stage {0} and {1} are mutually exclusive {0} commit by author {1} {0} commits by author {1} {0} commit by author {1} with key {2} now expired {0} commits by author {1} with key {2} now expired {0} commit not signed {0} commits not signed {0} commit not valid {0} commits not valid {0} commit with key now expired {0} commits with key now expired {0} commit with unknown key {0} commits with unknown keys {0} commits with valid signatures {0} conflict resolved, {1} remaining {0} conflicts resolved, {1} remaining {0} is not an SI unit. {0} is now stacked on {1}
{0} is{1} redirected to {2} {0} lock {1} {2}. {0} remembered {1} location {2} {0} signed {1} commit {0} signed {1} commits {0}: {1} ({2} multiparent)
Copyright © 2017 || Recoded By Mr.Bumblebee