comparison ja/filenames.tex @ 835:8a3041e6f3cb

reflect comments by Hiroshi Someya.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 11 Jul 2009 19:25:35 +0900
parents 5276f40fca1c
children
comparison
equal deleted inserted replaced
834:896ab6eaf1c6 835:8a3041e6f3cb
20 $B%s%I$O%U%!%$%kL>$KBP$7$FF10l$K$U$k$^$&!%%3%^%s%I$,%U%!%$%kL>$r07$&$d$jJ}(B 20 $B%s%I$O%U%!%$%kL>$KBP$7$FF10l$K$U$k$^$&!%%3%^%s%I$,%U%!%$%kL>$r07$&$d$jJ}(B
21 $B$r0J2<$K<($9!%(B 21 $B$r0J2<$K<($9!%(B
22 22
23 %If you explicitly name real files on the command line, Mercurial works 23 %If you explicitly name real files on the command line, Mercurial works
24 %with exactly those files, as you would expect. 24 %with exactly those files, as you would expect.
25 $B%3%^%s%I%i%$%s$K<B:]$N%U%!%$%kL>$rL@<(E*$KM?$($?;~$O!$(BMercurial$B$O$=$l$i(B 25 $B%3%^%s%I%i%$%s$K<B:]$N%U%!%$%kL>$rL@<(E*$KM?$($?;~$O!$(BMercurial$B$OM?$($i(B
26 $B$N%U%!%$%k$=$N$b$N$r07$&!%(B 26 $B$l$?%U%!%$%k$@$1$r07$&!%(B
27 \interaction{filenames.files} 27 \interaction{filenames.files}
28 28
29 %When you provide a directory name, Mercurial will interpret this as 29 %When you provide a directory name, Mercurial will interpret this as
30 %``operate on every file in this directory and its subdirectories''. 30 %``operate on every file in this directory and its subdirectories''.
31 %Mercurial traverses the files and subdirectories in a directory in 31 %Mercurial traverses the files and subdirectories in a directory in
64 %\item If the command has effects that are difficult or impossible to 64 %\item If the command has effects that are difficult or impossible to
65 % reverse, it will force you to explicitly provide at least one name 65 % reverse, it will force you to explicitly provide at least one name
66 % or pattern (see below). This protects you from accidentally 66 % or pattern (see below). This protects you from accidentally
67 % deleting files by running \hgcmd{remove} with no arguments, for 67 % deleting files by running \hgcmd{remove} with no arguments, for
68 % example. 68 % example.
69 \item $BI|85$,Fq$7$+$C$?$jIT2DG=$G$"$k$h$&$J8z2L$r;}$D%3%^%s%I$N>l9g!$:GDc(B 69 \item $BI|85$,:$Fq$G$"$C$?$jIT2DG=$G$"$k$h$&$J8z2L$r;}$D%3%^%s%I$N>l9g!$:G(B
70 1$B$D$NL>A0$d%Q%?!<%s$rM[$KMW5a$9$k!%!J2<5-$r;2>H!%!K$3$l$K$h$j!$Nc(B 70 $BDc(B1$B$D$NL>A0$d%Q%?!<%s$rL@<($9$k$3$H$r5a$a$k!J2<5-$r;2>H!%!K!%$3$&(B
71 $B$($P(B\hgcmd{remove}$B$K0z?t$rM?$($J$+$C$?$3$H$K$h$C$F8m$C$F%U%!%$%k$r(B 71 $B$9$k$3$H$G!$Nc$($P(B\hgcmd{remove}$B$K0z?t$rM?$($J$+$C$?$?$a$K%U%!%$%k(B
72 $B$9$Y$F>C$7$?$j$9$k$3$H$,$J$/$J$k!%(B 72 $B$9$Y$F$r8m$C$F>C$9$3$H$,$J$/$J$k!%(B
73 \end{itemize} 73 \end{itemize}
74 74
75 %It's easy to work around these default behaviours if they don't suit 75 %It's easy to work around these default behaviours if they don't suit
76 %you. If a command normally operates on the whole working directory, 76 %you. If a command normally operates on the whole working directory,
77 %you can invoke it on just the current directory and its subdirectories 77 %you can invoke it on just the current directory and its subdirectories
85 \interaction{filenames.wdir-subdir} 85 \interaction{filenames.wdir-subdir}
86 86
87 %Along the same lines, some commands normally print file names relative 87 %Along the same lines, some commands normally print file names relative
88 %to the root of the repository, even if you're invoking them from a 88 %to the root of the repository, even if you're invoking them from a
89 %subdirectory. Such a command will print file names relative to your 89 %subdirectory. Such a command will print file names relative to your
90
91 %subdirectory if you give it explicit names. Here, we're going to run 90 %subdirectory if you give it explicit names. Here, we're going to run
92
93 %\hgcmd{status} from a subdirectory, and get it to operate on the 91 %\hgcmd{status} from a subdirectory, and get it to operate on the
94 %entire working directory while printing file names relative to our 92 %entire working directory while printing file names relative to our
95
96 %subdirectory, by passing it the output of the \hgcmd{root} command. 93 %subdirectory, by passing it the output of the \hgcmd{root} command.
97 %\interaction{filenames.wdir-relname} 94 %\interaction{filenames.wdir-relname}
98 95
99 $B%5%V%G%#%l%/%H%j$+$i5/F0$7$F$b%j%]%8%H%j$N%k!<%H$X$NAjBP%Q%9$G%U%!%$%kL>(B 96 $B%5%V%G%#%l%/%H%j$+$i5/F0$7$F$b%U%!%$%kL>$r%j%]%8%H%j$N%k!<%H$+$i$NAjBP%Q(B
100 $B$rI=<($9$k%3%^%s%I$b$"$k!%$=$N$h$&$J%3%^%s%I$G$O!$%5%V%G%#%l%/%H%j$NL>A0(B 97 $B%9$GI=<($9$k%3%^%s%I$,$"$k!%$=$N$h$&$J%3%^%s%I$KL@<(E*$K%5%V%G%#%l%/%H%j(B
101 $B$rL@<(E*$KM?$($k$H!$%5%V%G%#%l%/%H%j$+$i$NAjBP%Q%9$rI=<($9$k$h$&$K$J$k!%(B 98 $BL>$rM?$($k$H!$8=:_$N%5%V%G%#%l%/%H%j$+$i$NAjBP%Q%9$,I=<($5$l$k!%$3$3$G!$(B
102 99 $B%5%V%G%#%l%/%H%jFb$+$i(B\hgcmd{status}$B%3%^%s%I$K(B\hgcmd{root}$B%3%^%s%I$N=PNO(B
103 $B$3$3$G$O%5%V%G%#%l%/%H%j$+$i(B\hgcmd{status}$B$r<B9T$9$k:]$K!$(B 100 $B$r0z?t$H$7$FM?$($F5/F0$7!$(B \hgcmd{status}$B%3%^%s%I$,%o!<%-%s%0%G%#%l%/%H%j(B
104 101 $BFb$N%U%!%$%k$r8=:_$N%5%V%G%#%l%/%H%j$KBP$9$kAjBP%Q%9$GI=<($9$kMM;R$r8+$F(B
105 102 $B$_$h$&!%(B
106 $B$7$F!$(B 103 \interaction{filenames.wdir-relname}
107 $B%3%^%s%I$,%o!<%-%s%0%G%#%l%/%H%jA4BN$N%U%!%$%kL>$r%5%V%G%#%l%/%H%j$KBP$7$FAjBPE*$K(B
108 $BI=<($9$kMM$r8+$F$_$h$&!%(B
109
110
111 104
112 105
113 %\section{Telling you what's going on} 106 %\section{Telling you what's going on}
114 \section{$B2?$,5/$-$F$$$k$N$+(B} 107 \section{$B2?$,5/$-$F$$$k$N$+(B}
115 108
591 $B$3$3$G(BWindows$B$^$?$O(BMac$B$N%f!<%6$,$3$N%A%'%s%8%;%C%H$r(Bpull$B$9$k$H!$(B 584 $B$3$3$G(BWindows$B$^$?$O(BMac$B$N%f!<%6$,$3$N%A%'%s%8%;%C%H$r(Bpull$B$9$k$H!$(B
592 Mercurial$B$N%j%]%8%H%j3JG<%a%+%K%:%`$OBg>.J8;z$KBP$7$F0BA4$J$?$a!$:G=i$N$&(B 585 Mercurial$B$N%j%]%8%H%j3JG<%a%+%K%:%`$OBg>.J8;z$KBP$7$F0BA4$J$?$a!$:G=i$N$&(B
593 $B$A$OLdBj$H$J$i$J$$!%$7$+$7%o!<%-%s%0%G%#%l%/%H%j$r$=$N%A%'%s%8%;%C%H$K(B 586 $B$A$OLdBj$H$J$i$J$$!%$7$+$7%o!<%-%s%0%G%#%l%/%H%j$r$=$N%A%'%s%8%;%C%H$K(B
594 \hgcmd{update}$B$7$h$&$H$7$?$j!$$=$N%A%'%s%8%;%C%H$H(B\hgcmd{merge}$B$7$h$&$H$9(B 587 \hgcmd{update}$B$7$h$&$H$7$?$j!$$=$N%A%'%s%8%;%C%H$H(B\hgcmd{merge}$B$7$h$&$H$9(B
595 $B$k$H!$(BMercurial$B$O!$(B 2$B$D$N%U%!%$%kL>$r%U%!%$%k%7%9%F%`$,F1$8L>A0$H$7$F07$&(B 588 $B$k$H!$(BMercurial$B$O!$(B 2$B$D$N%U%!%$%kL>$r%U%!%$%k%7%9%F%`$,F1$8L>A0$H$7$F07$&(B
596 $B$?$a$K@8$8$k%3%s%U%j%/%H$r8!=P$7!$(B update$B$d(Bmerge$B$r5v$5$J$$!%(B 589 $B$?$a$K@8$8$k%3%s%U%j%/%H$r8!=P$7!$(B \hgcmd{update}$B$d(B\hgcmd{merge}$B$r5v$5$J(B
590 $B$$!%(B
597 591
598 %\subsection{Fixing a case conflict} 592 %\subsection{Fixing a case conflict}
599 \subsection{$BBgJ8;z>.J8;z$N>WFM$r2r7h$9$k(B} 593 \subsection{$BBgJ8;z>.J8;z$N>WFM$r2r7h$9$k(B}
600 594
601 %If you are using Windows or a Mac in a mixed environment where some of 595 %If you are using Windows or a Mac in a mixed environment where some of
625 %project's history, and you still won't be able to \hgcmd{update} your 619 %project's history, and you still won't be able to \hgcmd{update} your
626 %working directory to that changeset on a Windows or MacOS system, but 620 %working directory to that changeset on a Windows or MacOS system, but
627 %you can continue development unimpeded. 621 %you can continue development unimpeded.
628 622
629 $BBg>.J8;z$N%U%!%$%kL>%3%s%U%j%/%H$,$"$k%A%'%s%8%;%C%H$O%W%m%8%'%/%H$NMzNr(B 623 $BBg>.J8;z$N%U%!%$%kL>%3%s%U%j%/%H$,$"$k%A%'%s%8%;%C%H$O%W%m%8%'%/%H$NMzNr(B
630 $B$K;D$C$F$*$j!$(B Windows$B$d(BMacOS$B$7$9$F$`$G$O$=$N%A%'%s%8%;%C%H$X(B 624 $B$K;D$C$F$*$j!$(B Windows$B$d(BMacOS$B%7%9%F%`$G$O$=$N%A%'%s%8%;%C%H$X(B
631 \hgcmd{update}$B$9$k$3$H$O$G$-$J$$$b$N$N!$LdBj$J$/3+H/$rB3$1$k$3$H$,$G$-$k!%(B 625 \hgcmd{update}$B$9$k$3$H$O$G$-$J$$$b$N$N!$LdBj$J$/3+H/$rB3$1$k$3$H$,$G$-$k!%(B
632 626
633 627
634 %%% Local Variables: 628 %%% Local Variables:
635 %%% mode: yatex 629 %%% mode: yatex