hgbook
changeset 115:b74102b56df5
Wow! Lots more work detailing the working directory, merging, etc.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Nov 13 16:19:48 2006 -0800 (2006-11-13) |
parents | ccff2b25478e |
children | ca99f247899e |
files | en/Makefile en/concepts.tex en/wdir-after-commit.svg en/wdir-branch.svg en/wdir-merge.svg en/wdir-pre-branch.svg |
line diff
1.1 --- a/en/Makefile Mon Nov 13 14:34:57 2006 -0800 1.2 +++ b/en/Makefile Mon Nov 13 16:19:48 2006 -0800 1.3 @@ -33,7 +33,10 @@ 1.4 tour-merge-pull.svg \ 1.5 tour-merge-sep-repos.svg \ 1.6 wdir.svg \ 1.7 - wdir-after-commit.svg 1.8 + wdir-after-commit.svg \ 1.9 + wdir-branch.svg \ 1.10 + wdir-merge.svg \ 1.11 + wdir-pre-branch.svg 1.12 1.13 image-svg := $(filter %.svg,$(image-sources)) 1.14
2.1 --- a/en/concepts.tex Mon Nov 13 14:34:57 2006 -0800 2.2 +++ b/en/concepts.tex Mon Nov 13 16:19:48 2006 -0800 2.3 @@ -204,6 +204,35 @@ 2.4 after the corrupted section. This would not be possible with a 2.5 delta-only storage model. 2.6 2.7 +\section{Revision history, branching, 2.8 + and merging} 2.9 + 2.10 +Every entry in a Mercurial revlog knows the identity of its immediate 2.11 +ancestor revision, usually referred to as its \emph{parent}. In fact, 2.12 +a revision contains room for not one parent, but two. Mercurial uses 2.13 +a special hash, called the ``null ID'', to represent the idea ``there 2.14 +is no parent here''. This hash is simply a string of zeroes. 2.15 + 2.16 +In figure~\ref{fig:concepts:revlog}, you can see an example of the 2.17 +conceptual structure of a revlog. Filelogs, manifests, and changelogs 2.18 +all have this same structure; they differ only in the kind of data 2.19 +stored in each delta or snapshot. 2.20 + 2.21 +The first revision in a revlog (at the bottom of the image) has the 2.22 +null ID in both of its parent slots. For a ``normal'' revision, its 2.23 +first parent slot contains the ID of its parent revision, and its 2.24 +second contains the null ID, indicating that the revision has only one 2.25 +real parent. Any two revisions that have the same parent ID are 2.26 +branches. A revision that represents a merge between branches has two 2.27 +normal revision IDs in its parent slots. 2.28 + 2.29 +\begin{figure}[ht] 2.30 + \centering 2.31 + \grafix{revlog} 2.32 + \caption{} 2.33 + \label{fig:concepts:revlog} 2.34 +\end{figure} 2.35 + 2.36 \section{The working directory} 2.37 2.38 In the working directory, Mercurial stores a snapshot of the files 2.39 @@ -266,58 +295,117 @@ 2.40 2.41 After a commit, Mercurial will update the parents of the working 2.42 directory, so that the first parent is the ID of the new changeset, 2.43 -and the second is the null ID. This is illustrated in 2.44 -figure~\ref{fig:concepts:wdir-after-commit}. 2.45 - 2.46 -\subsection{Other contents of the dirstate} 2.47 - 2.48 -Because Mercurial doesn't force you to tell it when you're modifying a 2.49 -file, it uses the dirstate to store some extra information so it can 2.50 -determine efficiently whether you have modified a file. For each file 2.51 -in the working directory, it stores the time that it last modified the 2.52 -file itself, and the size of the file at that time. 2.53 - 2.54 -When you explicitly \hgcmd{add}, \hgcmd{remove}, \hgcmd{rename} or 2.55 -\hgcmd{copy} files, the dirstate is updated each time. 2.56 - 2.57 -When Mercurial is checking the states of files in the working 2.58 -directory, it first checks a file's modification time. If that has 2.59 -not changed, the file must not have been modified. If the file's size 2.60 -has changed, the file must have been modified. If the modification 2.61 -time has changed, but the size has not, only then does Mercurial need 2.62 -to read the actual contents of the file to see if they've changed. 2.63 -Storing these few extra pieces of information dramatically reduces the 2.64 -amount of data that Mercurial needs to read, which yields large 2.65 -performance improvements compared to other revision control systems. 2.66 - 2.67 -\section{Revision history, branching, 2.68 - and merging} 2.69 - 2.70 -Every entry in a Mercurial revlog knows the identity of its immediate 2.71 -ancestor revision, usually referred to as its \emph{parent}. In fact, 2.72 -a revision contains room for not one parent, but two. Mercurial uses 2.73 -a special hash, called the ``null ID'', to represent the idea ``there 2.74 -is no parent here''. This hash is simply a string of zeroes. 2.75 - 2.76 -In figure~\ref{fig:concepts:revlog}, you can see an example of the 2.77 -conceptual structure of a revlog. Filelogs, manifests, and changelogs 2.78 -all have this same structure; they differ only in the kind of data 2.79 -stored in each delta or snapshot. 2.80 - 2.81 -The first revision in a revlog (at the bottom of the image) has the 2.82 -null ID in both of its parent slots. For a ``normal'' revision, its 2.83 -first parent slot contains the ID of its parent revision, and its 2.84 -second contains the null ID, indicating that the revision has only one 2.85 -real parent. Any two revisions that have the same parent ID are 2.86 -branches. A revision that represents a merge between branches has two 2.87 -normal revision IDs in its parent slots. 2.88 - 2.89 -\begin{figure}[ht] 2.90 - \centering 2.91 - \grafix{revlog} 2.92 - \caption{} 2.93 - \label{fig:concepts:revlog} 2.94 -\end{figure} 2.95 +and the second is the null ID. This is shown in 2.96 +figure~\ref{fig:concepts:wdir-after-commit}. Mercurial doesn't touch 2.97 +any of the files in the working directory when you commit; it just 2.98 +modifies the dirstate to note its new parents. 2.99 + 2.100 +\subsection{Creating a new head} 2.101 + 2.102 +It's perfectly normal to update the working directory to a changeset 2.103 +other than the current tip. For example, you might want to know what 2.104 +your project looked like last Tuesday, or you could be looking through 2.105 +changesets to see which one introduced a bug. In cases like this, the 2.106 +natural thing to do is update the working directory to the changeset 2.107 +you're interested in, and then examine the files in the working 2.108 +directory directly to see their contents as they werea when you 2.109 +committed that changeset. The effect of this is shown in 2.110 +figure~\ref{fig:concepts:wdir-pre-branch}. 2.111 + 2.112 +\begin{figure}[ht] 2.113 + \centering 2.114 + \grafix{wdir-pre-branch} 2.115 + \caption{The working directory, updated to an older changeset} 2.116 + \label{fig:concepts:wdir-pre-branch} 2.117 +\end{figure} 2.118 + 2.119 +Having updated the working directory to an older changeset, what 2.120 +happens if you make some changes, and then commit? Mercurial behaves 2.121 +in the same way as I outlined above. The parents of the working 2.122 +directory become the parents of the new changeset. This new changeset 2.123 +has no children, so it becomes the new tip. And the repository now 2.124 +contains two changesets that have no children; we call these 2.125 +\emph{heads}. You can see the structure that this creates in 2.126 +figure~\ref{fig:concepts:wdir-branch}. 2.127 + 2.128 +\begin{figure}[ht] 2.129 + \centering 2.130 + \grafix{wdir-branch} 2.131 + \caption{After a commit made while synced to an older changeset} 2.132 + \label{fig:concepts:wdir-branch} 2.133 +\end{figure} 2.134 + 2.135 +\begin{note} 2.136 + If you're new to Mercurial, you should keep in mind a common 2.137 + ``error'', which is to use the \hgcmd{pull} command without any 2.138 + options. By default, the \hgcmd{pull} command \emph{does not} 2.139 + update the working directory, so you'll bring new changesets into 2.140 + your repository, but the working directory will stay synced at the 2.141 + same changeset as before the pull. If you make some changes and 2.142 + commit afterwards, you'll thus create a new head, because your 2.143 + working directory isn't synced to whatever the current tip is. 2.144 + 2.145 + I put the word ``error'' in quotes because all that you need to do 2.146 + to rectify this situation is \hgcmd{merge}, then \hgcmd{commit}. In 2.147 + other words, this almost never has negative consequences; it just 2.148 + surprises people. I'll discuss other ways to avoid this behaviour, 2.149 + and why Mercurial behaves in this initially surprising way, later 2.150 + on. 2.151 +\end{note} 2.152 + 2.153 +\subsection{Merging heads} 2.154 + 2.155 +When you run the \hgcmd{merge} command, Mercurial leaves the first 2.156 +parent of the working directory unchanged, and sets the second parent 2.157 +to the changeset you're merging with, as shown in 2.158 +figure~\ref{fig:concepts:wdir-merge}. 2.159 + 2.160 +\begin{figure}[ht] 2.161 + \centering 2.162 + \grafix{wdir-merge} 2.163 + \caption{Merging two hehads} 2.164 + \label{fig:concepts:wdir-merge} 2.165 +\end{figure} 2.166 + 2.167 +Mercurial also has to modify the working directory, to merge the files 2.168 +managed in the two changesets. Simplified a little, the merging 2.169 +process goes like this, for every file in the manifests of both 2.170 +changesets. 2.171 +\begin{itemize} 2.172 +\item If neither changeset has modified a file, do nothing with that 2.173 + file. 2.174 +\item If one changeset has modified a file, and the other hasn't, 2.175 + create the modified copy of the file in the working directory. 2.176 +\item If one changeset has removed a file, and the other hasn't (or 2.177 + has also deleted it), delete the file from the working directory. 2.178 +\item If one changeset has removed a file, but the other has modified 2.179 + the file, ask the user what to do: keep the modified file, or remove 2.180 + it? 2.181 +\item If both changesets have modified a file, invoke an external 2.182 + merge program to choose the new contents for the merged file. This 2.183 + may require input from the user. 2.184 +\item If one changeset has modified a file, and the other has renamed 2.185 + or copied the file, make sure that the changes follow the new name 2.186 + of the file. 2.187 +\end{itemize} 2.188 +There are more details---merging has plenty of corner cases---but 2.189 +these are the most common choices that are involved in a merge. As 2.190 +you can see, most cases are completely automatic, and indeed most 2.191 +merges finish automatically, without requiring your input to resolve 2.192 +any conflicts. 2.193 + 2.194 +When you're thinking about what happens when you commit after a merge, 2.195 +once again the working directory is ``the changeset I'm about to 2.196 +commit''. After the \hgcmd{merge} command completes, the working 2.197 +directory has two parents; these will become the parents of the new 2.198 +changeset. 2.199 + 2.200 +Mercurial lets you perform multiple merges, but you must commit the 2.201 +results of each individual merge as you go. This is necessary because 2.202 +Mercurial only tracks two parents for both revisions and the working 2.203 +directory. While it would be technically possible to merge multiple 2.204 +changesets at once, the prospect of user confusion and making a 2.205 +terrible mess of a merge immediately becomes overwhelming. 2.206 2.207 \section{Other interesting design features} 2.208 2.209 @@ -460,6 +548,27 @@ 2.210 performance and increase the complexity of the software, each of which 2.211 is much more important to the ``feel'' of day-to-day use. 2.212 2.213 +\subsection{Other contents of the dirstate} 2.214 + 2.215 +Because Mercurial doesn't force you to tell it when you're modifying a 2.216 +file, it uses the dirstate to store some extra information so it can 2.217 +determine efficiently whether you have modified a file. For each file 2.218 +in the working directory, it stores the time that it last modified the 2.219 +file itself, and the size of the file at that time. 2.220 + 2.221 +When you explicitly \hgcmd{add}, \hgcmd{remove}, \hgcmd{rename} or 2.222 +\hgcmd{copy} files, the dirstate is updated each time. 2.223 + 2.224 +When Mercurial is checking the states of files in the working 2.225 +directory, it first checks a file's modification time. If that has 2.226 +not changed, the file must not have been modified. If the file's size 2.227 +has changed, the file must have been modified. If the modification 2.228 +time has changed, but the size has not, only then does Mercurial need 2.229 +to read the actual contents of the file to see if they've changed. 2.230 +Storing these few extra pieces of information dramatically reduces the 2.231 +amount of data that Mercurial needs to read, which yields large 2.232 +performance improvements compared to other revision control systems. 2.233 + 2.234 %%% Local Variables: 2.235 %%% mode: latex 2.236 %%% TeX-master: "00book"
3.1 --- a/en/wdir-after-commit.svg Mon Nov 13 14:34:57 2006 -0800 3.2 +++ b/en/wdir-after-commit.svg Mon Nov 13 16:19:48 2006 -0800 3.3 @@ -18,6 +18,16 @@ 3.4 sodipodi:docname="wdir-after-commit.svg"> 3.5 <defs 3.6 id="defs5973"> 3.7 + <linearGradient 3.8 + inkscape:collect="always" 3.9 + xlink:href="#linearGradient6049" 3.10 + id="linearGradient6445" 3.11 + gradientUnits="userSpaceOnUse" 3.12 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 3.13 + x1="333.91171" 3.14 + y1="488.79077" 3.15 + x2="508.94543" 3.16 + y2="263.79077" /> 3.17 <marker 3.18 inkscape:stockid="Arrow1Mstart" 3.19 orient="auto" 3.20 @@ -90,7 +100,7 @@ 3.21 xlink:href="#linearGradient6049" 3.22 id="linearGradient6216" 3.23 gradientUnits="userSpaceOnUse" 3.24 - gradientTransform="translate(-240.0462,-0.664361)" 3.25 + gradientTransform="translate(-6.0462,-0.664361)" 3.26 x1="333.91171" 3.27 y1="488.79077" 3.28 x2="508.94543" 3.29 @@ -100,7 +110,17 @@ 3.30 xlink:href="#linearGradient6049" 3.31 id="linearGradient6232" 3.32 gradientUnits="userSpaceOnUse" 3.33 - gradientTransform="matrix(1.000474,0,0,0.790947,-11.16014,50.85693)" 3.34 + gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 3.35 + x1="333.91171" 3.36 + y1="488.79077" 3.37 + x2="508.94543" 3.38 + y2="263.79077" /> 3.39 + <linearGradient 3.40 + inkscape:collect="always" 3.41 + xlink:href="#linearGradient6049" 3.42 + id="linearGradient6772" 3.43 + gradientUnits="userSpaceOnUse" 3.44 + gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 3.45 x1="333.91171" 3.46 y1="488.79077" 3.47 x2="508.94543" 3.48 @@ -149,13 +169,14 @@ 3.49 id="layer1"> 3.50 <rect 3.51 y="245.98355" 3.52 - x="94.239563" 3.53 + x="328.23956" 3.54 height="258.57144" 3.55 width="174.28572" 3.56 id="rect6047" 3.57 style="fill:url(#linearGradient6216);fill-opacity:1;stroke:#686868;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 3.58 <g 3.59 - id="g6261"> 3.60 + id="g6261" 3.61 + transform="translate(234,0)"> 3.62 <rect 3.63 y="258.7149" 3.64 x="114.11369" 3.65 @@ -180,17 +201,17 @@ 3.66 id="rect5996" 3.67 width="134.53746" 3.68 height="44.537449" 3.69 - x="114.11369" 3.70 + x="348.11371" 3.71 y="320.38159" /> 3.72 <text 3.73 xml:space="preserve" 3.74 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 3.75 - x="138.7962" 3.76 + x="372.7962" 3.77 y="346.1423" 3.78 id="text5998"><tspan 3.79 sodipodi:role="line" 3.80 id="tspan6000" 3.81 - x="138.7962" 3.82 + x="372.7962" 3.83 y="346.1423" 3.84 style="font-family:Courier">e7639888bb2f</tspan></text> 3.85 <rect 3.86 @@ -198,74 +219,74 @@ 3.87 id="rect6004" 3.88 width="134.53746" 3.89 height="44.537449" 3.90 - x="114.11369" 3.91 + x="348.11371" 3.92 y="382.04825" /> 3.93 <text 3.94 xml:space="preserve" 3.95 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 3.96 - x="136.65421" 3.97 + x="370.65421" 3.98 y="407.80896" 3.99 id="text6006"><tspan 3.100 sodipodi:role="line" 3.101 id="tspan6008" 3.102 - x="136.65421" 3.103 + x="370.65421" 3.104 y="407.80896" 3.105 style="font-family:Courier">7b064d8bac5e</tspan></text> 3.106 <path 3.107 inkscape:connector-type="polyline" 3.108 id="path6018" 3.109 - d="M 181.38242,303.62646 L 181.38242,320.00744" 3.110 + d="M 415.38242,303.62646 L 415.38242,320.00744" 3.111 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 3.112 <path 3.113 inkscape:connection-end="#rect6004" 3.114 inkscape:connector-type="polyline" 3.115 id="path6020" 3.116 - d="M 181.38242,365.29315 L 181.38242,381.6741" 3.117 + d="M 415.38242,365.29315 L 415.38243,381.67412" 3.118 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 3.119 <rect 3.120 style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 3.121 id="rect6039" 3.122 width="134.53746" 3.123 height="44.537449" 3.124 - x="114.11357" 3.125 + x="348.11359" 3.126 y="443.71487" /> 3.127 <text 3.128 xml:space="preserve" 3.129 style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 3.130 - x="138.79707" 3.131 + x="372.79706" 3.132 y="469.47556" 3.133 id="text6041"><tspan 3.134 sodipodi:role="line" 3.135 id="tspan6043" 3.136 - x="138.79707" 3.137 + x="372.79706" 3.138 y="469.47556" 3.139 style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 3.140 <path 3.141 inkscape:connection-end="#rect6039" 3.142 inkscape:connector-type="polyline" 3.143 id="path6045" 3.144 - d="M 181.38238,426.95981 L 181.38234,443.34086" 3.145 + d="M 415.38238,426.95981 L 415.38235,443.34087" 3.146 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 3.147 <text 3.148 xml:space="preserve" 3.149 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 3.150 - x="93.660484" 3.151 + x="327.66046" 3.152 y="231.36218" 3.153 id="text6102"><tspan 3.154 sodipodi:role="line" 3.155 id="tspan6104" 3.156 - x="93.660484" 3.157 + x="327.66046" 3.158 y="231.36218">History in repository</tspan></text> 3.159 <rect 3.160 y="245.94225" 3.161 - x="323.28415" 3.162 + x="557.28418" 3.163 height="204.51619" 3.164 width="174.36833" 3.165 id="rect6140" 3.166 style="fill:url(#linearGradient6232);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 3.167 <g 3.168 id="g6130" 3.169 - transform="translate(28.32541,24.38544)"> 3.170 + transform="translate(262.3254,24.38544)"> 3.171 <rect 3.172 style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 3.173 id="rect6106" 3.174 @@ -287,7 +308,7 @@ 3.175 </g> 3.176 <g 3.177 id="g6135" 3.178 - transform="translate(29.03958,49.83106)"> 3.179 + transform="translate(263.0396,49.83106)"> 3.180 <rect 3.181 inkscape:transform-center-y="102.85714" 3.182 inkscape:transform-center-x="129.28571" 3.183 @@ -314,36 +335,36 @@ 3.184 <text 3.185 xml:space="preserve" 3.186 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 3.187 - x="342.63208" 3.188 + x="576.63208" 3.189 y="270.479" 3.190 id="text6118"><tspan 3.191 sodipodi:role="line" 3.192 id="tspan6120" 3.193 - x="342.63208" 3.194 + x="576.63208" 3.195 y="270.479">First parent</tspan></text> 3.196 <text 3.197 xml:space="preserve" 3.198 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 3.199 - x="342.07544" 3.200 + x="576.07544" 3.201 y="364.49615" 3.202 id="text6122"><tspan 3.203 sodipodi:role="line" 3.204 id="tspan6124" 3.205 - x="342.07544" 3.206 + x="576.07544" 3.207 y="364.49615">Second parent</tspan></text> 3.208 <text 3.209 xml:space="preserve" 3.210 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 3.211 - x="322.61746" 3.212 + x="556.61743" 3.213 y="231.36218" 3.214 id="text6195"><tspan 3.215 sodipodi:role="line" 3.216 id="tspan6197" 3.217 - x="322.61746" 3.218 + x="556.61743" 3.219 y="231.36218">Parents of working directory</tspan></text> 3.220 <path 3.221 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow1Mend)" 3.222 - d="M 342.82543,297.63008 L 249.02528,287.95831" 3.223 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 3.224 + d="M 576.82542,297.63008 L 483.02528,287.95831" 3.225 id="path6266" 3.226 inkscape:connector-type="polyline" 3.227 inkscape:connection-start="#g6130" 3.228 @@ -356,16 +377,16 @@ 3.229 <text 3.230 xml:space="preserve" 3.231 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 3.232 - x="82.864075" 3.233 + x="316.86407" 3.234 y="275.6496" 3.235 id="text6573"><tspan 3.236 sodipodi:role="line" 3.237 id="tspan6575" 3.238 - x="82.864075" 3.239 + x="316.86407" 3.240 y="275.6496" 3.241 style="text-align:end;text-anchor:end">New</tspan><tspan 3.242 sodipodi:role="line" 3.243 - x="82.864075" 3.244 + x="316.86407" 3.245 y="290.6496" 3.246 id="tspan6577" 3.247 style="text-align:end;text-anchor:end">changeset</tspan></text>
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/en/wdir-branch.svg Mon Nov 13 16:19:48 2006 -0800 4.3 @@ -0,0 +1,418 @@ 4.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 4.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 4.6 +<svg 4.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 4.8 + xmlns:cc="http://web.resource.org/cc/" 4.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 4.10 + xmlns:svg="http://www.w3.org/2000/svg" 4.11 + xmlns="http://www.w3.org/2000/svg" 4.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 4.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 4.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 4.15 + width="744.09448819" 4.16 + height="1052.3622047" 4.17 + id="svg5971" 4.18 + sodipodi:version="0.32" 4.19 + inkscape:version="0.44.1" 4.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 4.21 + sodipodi:docname="wdir-branch.svg"> 4.22 + <defs 4.23 + id="defs5973"> 4.24 + <marker 4.25 + inkscape:stockid="Arrow1Mstart" 4.26 + orient="auto" 4.27 + refY="0.0" 4.28 + refX="0.0" 4.29 + id="Arrow1Mstart" 4.30 + style="overflow:visible"> 4.31 + <path 4.32 + id="path4855" 4.33 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 4.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 4.35 + transform="scale(0.4) translate(10,0)" /> 4.36 + </marker> 4.37 + <linearGradient 4.38 + id="linearGradient6049"> 4.39 + <stop 4.40 + style="stop-color:#686868;stop-opacity:1;" 4.41 + offset="0" 4.42 + id="stop6051" /> 4.43 + <stop 4.44 + style="stop-color:#f0f0f0;stop-opacity:1;" 4.45 + offset="1" 4.46 + id="stop6053" /> 4.47 + </linearGradient> 4.48 + <marker 4.49 + inkscape:stockid="Arrow1Mend" 4.50 + orient="auto" 4.51 + refY="0.0" 4.52 + refX="0.0" 4.53 + id="Arrow1Mend" 4.54 + style="overflow:visible;"> 4.55 + <path 4.56 + id="path4852" 4.57 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 4.58 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 4.59 + transform="scale(0.4) rotate(180) translate(10,0)" /> 4.60 + </marker> 4.61 + <linearGradient 4.62 + inkscape:collect="always" 4.63 + xlink:href="#linearGradient6049" 4.64 + id="linearGradient6083" 4.65 + gradientUnits="userSpaceOnUse" 4.66 + gradientTransform="translate(-240.0462,-8.633237e-6)" 4.67 + x1="333.91171" 4.68 + y1="488.79077" 4.69 + x2="508.94543" 4.70 + y2="263.79077" /> 4.71 + <linearGradient 4.72 + inkscape:collect="always" 4.73 + xlink:href="#linearGradient6049" 4.74 + id="linearGradient6142" 4.75 + gradientUnits="userSpaceOnUse" 4.76 + gradientTransform="translate(-42.00893,-30.49544)" 4.77 + x1="333.91171" 4.78 + y1="488.79077" 4.79 + x2="508.94543" 4.80 + y2="263.79077" /> 4.81 + <linearGradient 4.82 + inkscape:collect="always" 4.83 + xlink:href="#linearGradient6049" 4.84 + id="linearGradient6193" 4.85 + gradientUnits="userSpaceOnUse" 4.86 + gradientTransform="translate(-240.0462,-8.633237e-6)" 4.87 + x1="333.91171" 4.88 + y1="488.79077" 4.89 + x2="508.94543" 4.90 + y2="263.79077" /> 4.91 + <linearGradient 4.92 + inkscape:collect="always" 4.93 + xlink:href="#linearGradient6049" 4.94 + id="linearGradient6216" 4.95 + gradientUnits="userSpaceOnUse" 4.96 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 4.97 + x1="333.91171" 4.98 + y1="488.79077" 4.99 + x2="508.94543" 4.100 + y2="263.79077" /> 4.101 + <linearGradient 4.102 + inkscape:collect="always" 4.103 + xlink:href="#linearGradient6049" 4.104 + id="linearGradient6232" 4.105 + gradientUnits="userSpaceOnUse" 4.106 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 4.107 + x1="333.91171" 4.108 + y1="488.79077" 4.109 + x2="508.94543" 4.110 + y2="263.79077" /> 4.111 + <linearGradient 4.112 + inkscape:collect="always" 4.113 + xlink:href="#linearGradient6049" 4.114 + id="linearGradient6445" 4.115 + gradientUnits="userSpaceOnUse" 4.116 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 4.117 + x1="333.91171" 4.118 + y1="488.79077" 4.119 + x2="508.94543" 4.120 + y2="263.79077" /> 4.121 + <linearGradient 4.122 + inkscape:collect="always" 4.123 + xlink:href="#linearGradient6049" 4.124 + id="linearGradient6974" 4.125 + gradientUnits="userSpaceOnUse" 4.126 + gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 4.127 + x1="333.91171" 4.128 + y1="488.79077" 4.129 + x2="508.94543" 4.130 + y2="263.79077" /> 4.131 + <linearGradient 4.132 + inkscape:collect="always" 4.133 + xlink:href="#linearGradient6049" 4.134 + id="linearGradient6996" 4.135 + gradientUnits="userSpaceOnUse" 4.136 + gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 4.137 + x1="333.91171" 4.138 + y1="488.79077" 4.139 + x2="508.94543" 4.140 + y2="263.79077" /> 4.141 + </defs> 4.142 + <sodipodi:namedview 4.143 + id="base" 4.144 + pagecolor="#ffffff" 4.145 + bordercolor="#666666" 4.146 + borderopacity="1.0" 4.147 + gridtolerance="10000" 4.148 + guidetolerance="10" 4.149 + objecttolerance="10" 4.150 + inkscape:pageopacity="0.0" 4.151 + inkscape:pageshadow="2" 4.152 + inkscape:zoom="0.90509668" 4.153 + inkscape:cx="345.85973" 4.154 + inkscape:cy="690.49342" 4.155 + inkscape:document-units="px" 4.156 + inkscape:current-layer="layer1" 4.157 + showguides="true" 4.158 + inkscape:guide-bbox="true" 4.159 + inkscape:window-width="906" 4.160 + inkscape:window-height="620" 4.161 + inkscape:window-x="0" 4.162 + inkscape:window-y="25"> 4.163 + <sodipodi:guide 4.164 + orientation="vertical" 4.165 + position="-1.4285714" 4.166 + id="guide6022" /> 4.167 + </sodipodi:namedview> 4.168 + <metadata 4.169 + id="metadata5976"> 4.170 + <rdf:RDF> 4.171 + <cc:Work 4.172 + rdf:about=""> 4.173 + <dc:format>image/svg+xml</dc:format> 4.174 + <dc:type 4.175 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 4.176 + </cc:Work> 4.177 + </rdf:RDF> 4.178 + </metadata> 4.179 + <g 4.180 + inkscape:label="Layer 1" 4.181 + inkscape:groupmode="layer" 4.182 + id="layer1"> 4.183 + <rect 4.184 + y="246.06918" 4.185 + x="64.325172" 4.186 + height="204.26233" 4.187 + width="333.2135" 4.188 + id="rect6047" 4.189 + style="fill:url(#linearGradient6974);fill-opacity:1;stroke:#686868;stroke-width:0.91925466;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 4.190 + <g 4.191 + id="g1935"> 4.192 + <rect 4.193 + y="266.24374" 4.194 + x="84.113708" 4.195 + height="44.537449" 4.196 + width="134.53746" 4.197 + id="rect5996" 4.198 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 4.199 + <text 4.200 + id="text5998" 4.201 + y="292.00446" 4.202 + x="108.7962" 4.203 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.204 + xml:space="preserve"><tspan 4.205 + style="font-family:Courier" 4.206 + y="292.00446" 4.207 + x="108.7962" 4.208 + id="tspan6000" 4.209 + sodipodi:role="line">e7639888bb2f</tspan></text> 4.210 + </g> 4.211 + <g 4.212 + id="g6976" 4.213 + transform="translate(70,0)"> 4.214 + <rect 4.215 + y="327.9104" 4.216 + x="40.113693" 4.217 + height="44.537449" 4.218 + width="134.53746" 4.219 + id="rect6004" 4.220 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 4.221 + <text 4.222 + id="text6006" 4.223 + y="353.67111" 4.224 + x="62.654205" 4.225 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.226 + xml:space="preserve"><tspan 4.227 + style="font-family:Courier" 4.228 + y="353.67111" 4.229 + x="62.654205" 4.230 + id="tspan6008" 4.231 + sodipodi:role="line">7b064d8bac5e</tspan></text> 4.232 + </g> 4.233 + <path 4.234 + inkscape:connector-type="polyline" 4.235 + id="path6020" 4.236 + d="M 160.92915,311.15532 L 167.83571,327.53627" 4.237 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 4.238 + inkscape:connection-end="#g6976" 4.239 + inkscape:connection-start="#g1935" /> 4.240 + <rect 4.241 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 4.242 + id="rect6039" 4.243 + width="134.53746" 4.244 + height="44.537449" 4.245 + x="110.11359" 4.246 + y="389.57703" /> 4.247 + <text 4.248 + xml:space="preserve" 4.249 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.250 + x="134.79706" 4.251 + y="415.33771" 4.252 + id="text6041"><tspan 4.253 + sodipodi:role="line" 4.254 + id="tspan6043" 4.255 + x="134.79706" 4.256 + y="415.33771" 4.257 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 4.258 + <path 4.259 + inkscape:connection-end="#rect6039" 4.260 + inkscape:connector-type="polyline" 4.261 + id="path6045" 4.262 + d="M 177.38238,372.82195 L 177.38235,389.20303" 4.263 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 4.264 + <rect 4.265 + y="245.94225" 4.266 + x="447.28412" 4.267 + height="204.51619" 4.268 + width="174.36833" 4.269 + id="rect6140" 4.270 + style="fill:url(#linearGradient6996);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 4.271 + <g 4.272 + id="g6130" 4.273 + transform="translate(152.3254,24.38544)"> 4.274 + <rect 4.275 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 4.276 + id="rect6106" 4.277 + width="134.53746" 4.278 + height="44.537449" 4.279 + x="314.87415" 4.280 + y="257.95059" /> 4.281 + <text 4.282 + xml:space="preserve" 4.283 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.284 + x="339.55664" 4.285 + y="283.7113" 4.286 + id="text6108"><tspan 4.287 + sodipodi:role="line" 4.288 + id="tspan6110" 4.289 + x="339.55664" 4.290 + y="283.7113" 4.291 + style="font-family:Courier">ffb20e1701ea</tspan></text> 4.292 + </g> 4.293 + <g 4.294 + id="g6135" 4.295 + transform="translate(153.0396,49.83106)"> 4.296 + <rect 4.297 + inkscape:transform-center-y="102.85714" 4.298 + inkscape:transform-center-x="129.28571" 4.299 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 4.300 + id="rect6112" 4.301 + width="134.53746" 4.302 + height="44.537449" 4.303 + x="314.15985" 4.304 + y="326.52203" /> 4.305 + <text 4.306 + inkscape:transform-center-y="102.7311" 4.307 + inkscape:transform-center-x="128.69672" 4.308 + xml:space="preserve" 4.309 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.310 + x="338.84335" 4.311 + y="352.28271" 4.312 + id="text6114"><tspan 4.313 + sodipodi:role="line" 4.314 + id="tspan6116" 4.315 + x="338.84335" 4.316 + y="352.28271" 4.317 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 4.318 + </g> 4.319 + <text 4.320 + xml:space="preserve" 4.321 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.322 + x="466.63208" 4.323 + y="270.479" 4.324 + id="text6118"><tspan 4.325 + sodipodi:role="line" 4.326 + id="tspan6120" 4.327 + x="466.63208" 4.328 + y="270.479">First parent</tspan></text> 4.329 + <text 4.330 + xml:space="preserve" 4.331 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.332 + x="466.07544" 4.333 + y="364.49615" 4.334 + id="text6122"><tspan 4.335 + sodipodi:role="line" 4.336 + id="tspan6124" 4.337 + x="466.07544" 4.338 + y="364.49615">Second parent</tspan></text> 4.339 + <text 4.340 + xml:space="preserve" 4.341 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.342 + x="446.61743" 4.343 + y="231.36218" 4.344 + id="text6195"><tspan 4.345 + sodipodi:role="line" 4.346 + id="tspan6197" 4.347 + x="446.61743" 4.348 + y="231.36218">Parents of working directory</tspan></text> 4.349 + <path 4.350 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" 4.351 + d="M 466.82542,300.21999 L 377.00207,294.39744" 4.352 + id="path6266" 4.353 + inkscape:connector-type="polyline" 4.354 + inkscape:connection-start="#g6130" 4.355 + inkscape:connection-end="#rect1925" /> 4.356 + <path 4.357 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 4.358 + d="M 665.12232,418.17579 L 665.12232,418.17579" 4.359 + id="path6270" 4.360 + inkscape:connector-type="polyline" /> 4.361 + <g 4.362 + id="g2845"> 4.363 + <rect 4.364 + y="266.24374" 4.365 + x="242.09048" 4.366 + height="44.537449" 4.367 + width="134.53746" 4.368 + id="rect1925" 4.369 + style="fill:#9f9f9f;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 4.370 + <text 4.371 + id="text1927" 4.372 + y="292.00446" 4.373 + x="266.77298" 4.374 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.375 + xml:space="preserve"><tspan 4.376 + style="font-family:Courier" 4.377 + y="292.00446" 4.378 + x="266.77298" 4.379 + id="tspan1929" 4.380 + sodipodi:role="line">ffb20e1701ea</tspan></text> 4.381 + </g> 4.382 + <path 4.383 + inkscape:connector-type="polyline" 4.384 + id="path1933" 4.385 + d="M 260.89978,311.15532 L 225.84185,327.53627" 4.386 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 4.387 + inkscape:connection-end="#g6976" /> 4.388 + <text 4.389 + xml:space="preserve" 4.390 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.391 + x="109.45568" 4.392 + y="231.4554" 4.393 + id="text2837"><tspan 4.394 + sodipodi:role="line" 4.395 + id="tspan2839" 4.396 + x="109.45568" 4.397 + y="231.4554">Pre-existing head</tspan></text> 4.398 + <text 4.399 + xml:space="preserve" 4.400 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.401 + x="237.54184" 4.402 + y="231.4554" 4.403 + id="text2841"><tspan 4.404 + sodipodi:role="line" 4.405 + id="tspan2843" 4.406 + x="237.54184" 4.407 + y="231.4554">Newly created head (and tip)</tspan></text> 4.408 + <path 4.409 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 4.410 + d="M 148.05048,235.87482 L 149.94915,265.86962" 4.411 + id="path2850" 4.412 + inkscape:connector-type="polyline" 4.413 + inkscape:connection-end="#g1935" /> 4.414 + <path 4.415 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 4.416 + d="M 303.83495,238.08453 L 306.87874,265.86962" 4.417 + id="path2852" 4.418 + inkscape:connector-type="polyline" 4.419 + inkscape:connection-end="#g2845" /> 4.420 + </g> 4.421 +</svg>
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/en/wdir-merge.svg Mon Nov 13 16:19:48 2006 -0800 5.3 @@ -0,0 +1,425 @@ 5.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 5.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 5.6 +<svg 5.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 5.8 + xmlns:cc="http://web.resource.org/cc/" 5.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 5.10 + xmlns:svg="http://www.w3.org/2000/svg" 5.11 + xmlns="http://www.w3.org/2000/svg" 5.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 5.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 5.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 5.15 + width="744.09448819" 5.16 + height="1052.3622047" 5.17 + id="svg5971" 5.18 + sodipodi:version="0.32" 5.19 + inkscape:version="0.44.1" 5.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 5.21 + sodipodi:docname="wdir-merge.svg"> 5.22 + <defs 5.23 + id="defs5973"> 5.24 + <marker 5.25 + inkscape:stockid="Arrow1Mstart" 5.26 + orient="auto" 5.27 + refY="0.0" 5.28 + refX="0.0" 5.29 + id="Arrow1Mstart" 5.30 + style="overflow:visible"> 5.31 + <path 5.32 + id="path4855" 5.33 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 5.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 5.35 + transform="scale(0.4) translate(10,0)" /> 5.36 + </marker> 5.37 + <linearGradient 5.38 + id="linearGradient6049"> 5.39 + <stop 5.40 + style="stop-color:#686868;stop-opacity:1;" 5.41 + offset="0" 5.42 + id="stop6051" /> 5.43 + <stop 5.44 + style="stop-color:#f0f0f0;stop-opacity:1;" 5.45 + offset="1" 5.46 + id="stop6053" /> 5.47 + </linearGradient> 5.48 + <marker 5.49 + inkscape:stockid="Arrow1Mend" 5.50 + orient="auto" 5.51 + refY="0.0" 5.52 + refX="0.0" 5.53 + id="Arrow1Mend" 5.54 + style="overflow:visible;"> 5.55 + <path 5.56 + id="path4852" 5.57 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 5.58 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 5.59 + transform="scale(0.4) rotate(180) translate(10,0)" /> 5.60 + </marker> 5.61 + <linearGradient 5.62 + inkscape:collect="always" 5.63 + xlink:href="#linearGradient6049" 5.64 + id="linearGradient6083" 5.65 + gradientUnits="userSpaceOnUse" 5.66 + gradientTransform="translate(-240.0462,-8.633237e-6)" 5.67 + x1="333.91171" 5.68 + y1="488.79077" 5.69 + x2="508.94543" 5.70 + y2="263.79077" /> 5.71 + <linearGradient 5.72 + inkscape:collect="always" 5.73 + xlink:href="#linearGradient6049" 5.74 + id="linearGradient6142" 5.75 + gradientUnits="userSpaceOnUse" 5.76 + gradientTransform="translate(-42.00893,-30.49544)" 5.77 + x1="333.91171" 5.78 + y1="488.79077" 5.79 + x2="508.94543" 5.80 + y2="263.79077" /> 5.81 + <linearGradient 5.82 + inkscape:collect="always" 5.83 + xlink:href="#linearGradient6049" 5.84 + id="linearGradient6193" 5.85 + gradientUnits="userSpaceOnUse" 5.86 + gradientTransform="translate(-240.0462,-8.633237e-6)" 5.87 + x1="333.91171" 5.88 + y1="488.79077" 5.89 + x2="508.94543" 5.90 + y2="263.79077" /> 5.91 + <linearGradient 5.92 + inkscape:collect="always" 5.93 + xlink:href="#linearGradient6049" 5.94 + id="linearGradient6216" 5.95 + gradientUnits="userSpaceOnUse" 5.96 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 5.97 + x1="333.91171" 5.98 + y1="488.79077" 5.99 + x2="508.94543" 5.100 + y2="263.79077" /> 5.101 + <linearGradient 5.102 + inkscape:collect="always" 5.103 + xlink:href="#linearGradient6049" 5.104 + id="linearGradient6232" 5.105 + gradientUnits="userSpaceOnUse" 5.106 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 5.107 + x1="333.91171" 5.108 + y1="488.79077" 5.109 + x2="508.94543" 5.110 + y2="263.79077" /> 5.111 + <linearGradient 5.112 + inkscape:collect="always" 5.113 + xlink:href="#linearGradient6049" 5.114 + id="linearGradient6445" 5.115 + gradientUnits="userSpaceOnUse" 5.116 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 5.117 + x1="333.91171" 5.118 + y1="488.79077" 5.119 + x2="508.94543" 5.120 + y2="263.79077" /> 5.121 + <linearGradient 5.122 + inkscape:collect="always" 5.123 + xlink:href="#linearGradient6049" 5.124 + id="linearGradient6974" 5.125 + gradientUnits="userSpaceOnUse" 5.126 + gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 5.127 + x1="333.91171" 5.128 + y1="488.79077" 5.129 + x2="508.94543" 5.130 + y2="263.79077" /> 5.131 + <linearGradient 5.132 + inkscape:collect="always" 5.133 + xlink:href="#linearGradient6049" 5.134 + id="linearGradient6996" 5.135 + gradientUnits="userSpaceOnUse" 5.136 + gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 5.137 + x1="333.91171" 5.138 + y1="488.79077" 5.139 + x2="508.94543" 5.140 + y2="263.79077" /> 5.141 + </defs> 5.142 + <sodipodi:namedview 5.143 + id="base" 5.144 + pagecolor="#ffffff" 5.145 + bordercolor="#666666" 5.146 + borderopacity="1.0" 5.147 + gridtolerance="10000" 5.148 + guidetolerance="10" 5.149 + objecttolerance="10" 5.150 + inkscape:pageopacity="0.0" 5.151 + inkscape:pageshadow="2" 5.152 + inkscape:zoom="1.28" 5.153 + inkscape:cx="345.85973" 5.154 + inkscape:cy="690.49342" 5.155 + inkscape:document-units="px" 5.156 + inkscape:current-layer="layer1" 5.157 + showguides="true" 5.158 + inkscape:guide-bbox="true" 5.159 + inkscape:window-width="906" 5.160 + inkscape:window-height="620" 5.161 + inkscape:window-x="0" 5.162 + inkscape:window-y="25"> 5.163 + <sodipodi:guide 5.164 + orientation="vertical" 5.165 + position="-1.4285714" 5.166 + id="guide6022" /> 5.167 + </sodipodi:namedview> 5.168 + <metadata 5.169 + id="metadata5976"> 5.170 + <rdf:RDF> 5.171 + <cc:Work 5.172 + rdf:about=""> 5.173 + <dc:format>image/svg+xml</dc:format> 5.174 + <dc:type 5.175 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 5.176 + </cc:Work> 5.177 + </rdf:RDF> 5.178 + </metadata> 5.179 + <g 5.180 + inkscape:label="Layer 1" 5.181 + inkscape:groupmode="layer" 5.182 + id="layer1"> 5.183 + <rect 5.184 + y="246.06918" 5.185 + x="64.325172" 5.186 + height="204.26233" 5.187 + width="333.2135" 5.188 + id="rect6047" 5.189 + style="fill:url(#linearGradient6974);fill-opacity:1;stroke:#686868;stroke-width:0.91925466;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 5.190 + <g 5.191 + id="g6976" 5.192 + transform="translate(70,0)"> 5.193 + <rect 5.194 + y="327.9104" 5.195 + x="40.113693" 5.196 + height="44.537449" 5.197 + width="134.53746" 5.198 + id="rect6004" 5.199 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 5.200 + <text 5.201 + id="text6006" 5.202 + y="353.67111" 5.203 + x="62.654205" 5.204 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 5.205 + xml:space="preserve"><tspan 5.206 + style="font-family:Courier" 5.207 + y="353.67111" 5.208 + x="62.654205" 5.209 + id="tspan6008" 5.210 + sodipodi:role="line">7b064d8bac5e</tspan></text> 5.211 + </g> 5.212 + <path 5.213 + inkscape:connector-type="polyline" 5.214 + id="path6020" 5.215 + d="M 160.92915,311.15532 L 167.83571,327.53627" 5.216 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 5.217 + inkscape:connection-end="#g6976" 5.218 + inkscape:connection-start="#g1935" /> 5.219 + <rect 5.220 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.221 + id="rect6039" 5.222 + width="134.53746" 5.223 + height="44.537449" 5.224 + x="110.11359" 5.225 + y="389.57703" /> 5.226 + <text 5.227 + xml:space="preserve" 5.228 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 5.229 + x="134.79706" 5.230 + y="415.33771" 5.231 + id="text6041"><tspan 5.232 + sodipodi:role="line" 5.233 + id="tspan6043" 5.234 + x="134.79706" 5.235 + y="415.33771" 5.236 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 5.237 + <path 5.238 + inkscape:connection-end="#rect6039" 5.239 + inkscape:connector-type="polyline" 5.240 + id="path6045" 5.241 + d="M 177.38238,372.82195 L 177.38235,389.20303" 5.242 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 5.243 + <rect 5.244 + y="245.94225" 5.245 + x="447.28412" 5.246 + height="204.51619" 5.247 + width="174.36833" 5.248 + id="rect6140" 5.249 + style="fill:url(#linearGradient6996);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 5.250 + <g 5.251 + id="g6130" 5.252 + transform="translate(152.3254,24.38544)"> 5.253 + <rect 5.254 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 5.255 + id="rect6106" 5.256 + width="134.53746" 5.257 + height="44.537449" 5.258 + x="314.87415" 5.259 + y="257.95059" /> 5.260 + <text 5.261 + xml:space="preserve" 5.262 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 5.263 + x="339.55664" 5.264 + y="283.7113" 5.265 + id="text6108"><tspan 5.266 + sodipodi:role="line" 5.267 + id="tspan6110" 5.268 + x="339.55664" 5.269 + y="283.7113" 5.270 + style="font-family:Courier">ffb20e1701ea</tspan></text> 5.271 + </g> 5.272 + <g 5.273 + id="g6135" 5.274 + transform="translate(153.0396,49.83106)"> 5.275 + <rect 5.276 + inkscape:transform-center-y="102.85714" 5.277 + inkscape:transform-center-x="129.28571" 5.278 + style="fill:#d4d4d4;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.279 + id="rect6112" 5.280 + width="134.53746" 5.281 + height="44.537449" 5.282 + x="314.15985" 5.283 + y="326.52203" /> 5.284 + <text 5.285 + inkscape:transform-center-y="102.7311" 5.286 + inkscape:transform-center-x="128.69672" 5.287 + xml:space="preserve" 5.288 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 5.289 + x="338.84335" 5.290 + y="352.28271" 5.291 + id="text6114"><tspan 5.292 + sodipodi:role="line" 5.293 + id="tspan6116" 5.294 + x="338.84335" 5.295 + y="352.28271" 5.296 + style="fill:black;fill-opacity:1;font-family:Courier">e7639888bb2f</tspan></text> 5.297 + </g> 5.298 + <text 5.299 + xml:space="preserve" 5.300 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 5.301 + x="466.63208" 5.302 + y="270.479" 5.303 + id="text6118"><tspan 5.304 + sodipodi:role="line" 5.305 + id="tspan6120" 5.306 + x="466.63208" 5.307 + y="270.479">First parent (unchanged)</tspan></text> 5.308 + <text 5.309 + xml:space="preserve" 5.310 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 5.311 + x="466.07544" 5.312 + y="364.49615" 5.313 + id="text6122"><tspan 5.314 + sodipodi:role="line" 5.315 + id="tspan6124" 5.316 + x="466.07544" 5.317 + y="364.49615">Second parent</tspan></text> 5.318 + <text 5.319 + xml:space="preserve" 5.320 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 5.321 + x="446.61743" 5.322 + y="231.36218" 5.323 + id="text6195"><tspan 5.324 + sodipodi:role="line" 5.325 + id="tspan6197" 5.326 + x="446.61743" 5.327 + y="231.36218">Parents of working directory</tspan></text> 5.328 + <path 5.329 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" 5.330 + d="M 466.82542,300.21999 L 377.00207,294.39744" 5.331 + id="path6266" 5.332 + inkscape:connector-type="polyline" 5.333 + inkscape:connection-start="#g6130" 5.334 + inkscape:connection-end="#rect1925" /> 5.335 + <path 5.336 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 5.337 + d="M 665.12232,418.17579 L 665.12232,418.17579" 5.338 + id="path6270" 5.339 + inkscape:connector-type="polyline" /> 5.340 + <g 5.341 + id="g2845"> 5.342 + <rect 5.343 + y="266.24374" 5.344 + x="242.09048" 5.345 + height="44.537449" 5.346 + width="134.53746" 5.347 + id="rect1925" 5.348 + style="fill:#9f9f9f;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 5.349 + <text 5.350 + id="text1927" 5.351 + y="292.00446" 5.352 + x="266.77298" 5.353 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 5.354 + xml:space="preserve"><tspan 5.355 + style="font-family:Courier" 5.356 + y="292.00446" 5.357 + x="266.77298" 5.358 + id="tspan1929" 5.359 + sodipodi:role="line">ffb20e1701ea</tspan></text> 5.360 + </g> 5.361 + <path 5.362 + inkscape:connector-type="polyline" 5.363 + id="path1933" 5.364 + d="M 260.89978,311.15532 L 225.84185,327.53627" 5.365 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 5.366 + inkscape:connection-end="#g6976" /> 5.367 + <text 5.368 + xml:space="preserve" 5.369 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 5.370 + x="109.45568" 5.371 + y="231.4554" 5.372 + id="text2837"><tspan 5.373 + sodipodi:role="line" 5.374 + id="tspan2839" 5.375 + x="109.45568" 5.376 + y="231.4554">Pre-existing head</tspan></text> 5.377 + <text 5.378 + xml:space="preserve" 5.379 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 5.380 + x="237.54184" 5.381 + y="231.4554" 5.382 + id="text2841"><tspan 5.383 + sodipodi:role="line" 5.384 + id="tspan2843" 5.385 + x="237.54184" 5.386 + y="231.4554">Newly created head (and tip)</tspan></text> 5.387 + <path 5.388 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 5.389 + d="M 148.05048,235.87482 L 149.94915,265.86962" 5.390 + id="path2850" 5.391 + inkscape:connector-type="polyline" 5.392 + inkscape:connection-end="#g1935" /> 5.393 + <path 5.394 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 5.395 + d="M 303.83495,238.08453 L 306.87874,265.86962" 5.396 + id="path2852" 5.397 + inkscape:connector-type="polyline" 5.398 + inkscape:connection-end="#g2845" /> 5.399 + <path 5.400 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" 5.401 + d="M 466.82545,379.17944 L 219.0253,307.95488" 5.402 + id="path3016" 5.403 + inkscape:connector-type="polyline" 5.404 + inkscape:connection-start="#g6135" 5.405 + inkscape:connection-end="#g1935" /> 5.406 + <g 5.407 + id="g1935"> 5.408 + <rect 5.409 + y="266.24374" 5.410 + x="84.113708" 5.411 + height="44.537449" 5.412 + width="134.53746" 5.413 + id="rect5996" 5.414 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 5.415 + <text 5.416 + id="text5998" 5.417 + y="292.00446" 5.418 + x="108.7962" 5.419 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 5.420 + xml:space="preserve"><tspan 5.421 + style="font-family:Courier" 5.422 + y="292.00446" 5.423 + x="108.7962" 5.424 + id="tspan6000" 5.425 + sodipodi:role="line">e7639888bb2f</tspan></text> 5.426 + </g> 5.427 + </g> 5.428 +</svg>
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/en/wdir-pre-branch.svg Mon Nov 13 16:19:48 2006 -0800 6.3 @@ -0,0 +1,364 @@ 6.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 6.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 6.6 +<svg 6.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 6.8 + xmlns:cc="http://web.resource.org/cc/" 6.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 6.10 + xmlns:svg="http://www.w3.org/2000/svg" 6.11 + xmlns="http://www.w3.org/2000/svg" 6.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 6.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 6.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 6.15 + width="744.09448819" 6.16 + height="1052.3622047" 6.17 + id="svg5971" 6.18 + sodipodi:version="0.32" 6.19 + inkscape:version="0.44.1" 6.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 6.21 + sodipodi:docname="wdir-branch.svg"> 6.22 + <defs 6.23 + id="defs5973"> 6.24 + <marker 6.25 + inkscape:stockid="Arrow1Mstart" 6.26 + orient="auto" 6.27 + refY="0.0" 6.28 + refX="0.0" 6.29 + id="Arrow1Mstart" 6.30 + style="overflow:visible"> 6.31 + <path 6.32 + id="path4855" 6.33 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 6.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 6.35 + transform="scale(0.4) translate(10,0)" /> 6.36 + </marker> 6.37 + <linearGradient 6.38 + id="linearGradient6049"> 6.39 + <stop 6.40 + style="stop-color:#686868;stop-opacity:1;" 6.41 + offset="0" 6.42 + id="stop6051" /> 6.43 + <stop 6.44 + style="stop-color:#f0f0f0;stop-opacity:1;" 6.45 + offset="1" 6.46 + id="stop6053" /> 6.47 + </linearGradient> 6.48 + <marker 6.49 + inkscape:stockid="Arrow1Mend" 6.50 + orient="auto" 6.51 + refY="0.0" 6.52 + refX="0.0" 6.53 + id="Arrow1Mend" 6.54 + style="overflow:visible;"> 6.55 + <path 6.56 + id="path4852" 6.57 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 6.58 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 6.59 + transform="scale(0.4) rotate(180) translate(10,0)" /> 6.60 + </marker> 6.61 + <linearGradient 6.62 + inkscape:collect="always" 6.63 + xlink:href="#linearGradient6049" 6.64 + id="linearGradient6083" 6.65 + gradientUnits="userSpaceOnUse" 6.66 + gradientTransform="translate(-240.0462,-8.633237e-6)" 6.67 + x1="333.91171" 6.68 + y1="488.79077" 6.69 + x2="508.94543" 6.70 + y2="263.79077" /> 6.71 + <linearGradient 6.72 + inkscape:collect="always" 6.73 + xlink:href="#linearGradient6049" 6.74 + id="linearGradient6142" 6.75 + gradientUnits="userSpaceOnUse" 6.76 + gradientTransform="translate(-42.00893,-30.49544)" 6.77 + x1="333.91171" 6.78 + y1="488.79077" 6.79 + x2="508.94543" 6.80 + y2="263.79077" /> 6.81 + <linearGradient 6.82 + inkscape:collect="always" 6.83 + xlink:href="#linearGradient6049" 6.84 + id="linearGradient6193" 6.85 + gradientUnits="userSpaceOnUse" 6.86 + gradientTransform="translate(-240.0462,-8.633237e-6)" 6.87 + x1="333.91171" 6.88 + y1="488.79077" 6.89 + x2="508.94543" 6.90 + y2="263.79077" /> 6.91 + <linearGradient 6.92 + inkscape:collect="always" 6.93 + xlink:href="#linearGradient6049" 6.94 + id="linearGradient6216" 6.95 + gradientUnits="userSpaceOnUse" 6.96 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 6.97 + x1="333.91171" 6.98 + y1="488.79077" 6.99 + x2="508.94543" 6.100 + y2="263.79077" /> 6.101 + <linearGradient 6.102 + inkscape:collect="always" 6.103 + xlink:href="#linearGradient6049" 6.104 + id="linearGradient6232" 6.105 + gradientUnits="userSpaceOnUse" 6.106 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 6.107 + x1="333.91171" 6.108 + y1="488.79077" 6.109 + x2="508.94543" 6.110 + y2="263.79077" /> 6.111 + <linearGradient 6.112 + inkscape:collect="always" 6.113 + xlink:href="#linearGradient6049" 6.114 + id="linearGradient6445" 6.115 + gradientUnits="userSpaceOnUse" 6.116 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 6.117 + x1="333.91171" 6.118 + y1="488.79077" 6.119 + x2="508.94543" 6.120 + y2="263.79077" /> 6.121 + <linearGradient 6.122 + inkscape:collect="always" 6.123 + xlink:href="#linearGradient6049" 6.124 + id="linearGradient6974" 6.125 + gradientUnits="userSpaceOnUse" 6.126 + gradientTransform="matrix(1.000474,0,0,0.790947,-314.246,50.85694)" 6.127 + x1="333.91171" 6.128 + y1="488.79077" 6.129 + x2="508.94543" 6.130 + y2="263.79077" /> 6.131 + <linearGradient 6.132 + inkscape:collect="always" 6.133 + xlink:href="#linearGradient6049" 6.134 + id="linearGradient6996" 6.135 + gradientUnits="userSpaceOnUse" 6.136 + gradientTransform="matrix(1.000473,0,0,0.790947,-85.16012,50.85693)" 6.137 + x1="333.91171" 6.138 + y1="488.79077" 6.139 + x2="508.94543" 6.140 + y2="263.79077" /> 6.141 + </defs> 6.142 + <sodipodi:namedview 6.143 + id="base" 6.144 + pagecolor="#ffffff" 6.145 + bordercolor="#666666" 6.146 + borderopacity="1.0" 6.147 + gridtolerance="10000" 6.148 + guidetolerance="10" 6.149 + objecttolerance="10" 6.150 + inkscape:pageopacity="0.0" 6.151 + inkscape:pageshadow="2" 6.152 + inkscape:zoom="0.90509668" 6.153 + inkscape:cx="390.0539" 6.154 + inkscape:cy="690.49342" 6.155 + inkscape:document-units="px" 6.156 + inkscape:current-layer="layer1" 6.157 + showguides="true" 6.158 + inkscape:guide-bbox="true" 6.159 + inkscape:window-width="906" 6.160 + inkscape:window-height="620" 6.161 + inkscape:window-x="0" 6.162 + inkscape:window-y="25"> 6.163 + <sodipodi:guide 6.164 + orientation="vertical" 6.165 + position="-1.4285714" 6.166 + id="guide6022" /> 6.167 + </sodipodi:namedview> 6.168 + <metadata 6.169 + id="metadata5976"> 6.170 + <rdf:RDF> 6.171 + <cc:Work 6.172 + rdf:about=""> 6.173 + <dc:format>image/svg+xml</dc:format> 6.174 + <dc:type 6.175 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 6.176 + </cc:Work> 6.177 + </rdf:RDF> 6.178 + </metadata> 6.179 + <g 6.180 + inkscape:label="Layer 1" 6.181 + inkscape:groupmode="layer" 6.182 + id="layer1"> 6.183 + <rect 6.184 + y="245.94225" 6.185 + x="20.198257" 6.186 + height="204.51619" 6.187 + width="174.36833" 6.188 + id="rect6047" 6.189 + style="fill:url(#linearGradient6974);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 6.190 + <rect 6.191 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 6.192 + id="rect5996" 6.193 + width="134.53746" 6.194 + height="44.537449" 6.195 + x="40.113693" 6.196 + y="266.24374" /> 6.197 + <text 6.198 + xml:space="preserve" 6.199 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 6.200 + x="64.796204" 6.201 + y="292.00446" 6.202 + id="text5998"><tspan 6.203 + sodipodi:role="line" 6.204 + id="tspan6000" 6.205 + x="64.796204" 6.206 + y="292.00446" 6.207 + style="font-family:Courier">e7639888bb2f</tspan></text> 6.208 + <g 6.209 + id="g6976"> 6.210 + <rect 6.211 + y="327.9104" 6.212 + x="40.113693" 6.213 + height="44.537449" 6.214 + width="134.53746" 6.215 + id="rect6004" 6.216 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 6.217 + <text 6.218 + id="text6006" 6.219 + y="353.67111" 6.220 + x="62.654205" 6.221 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 6.222 + xml:space="preserve"><tspan 6.223 + style="font-family:Courier" 6.224 + y="353.67111" 6.225 + x="62.654205" 6.226 + id="tspan6008" 6.227 + sodipodi:role="line">7b064d8bac5e</tspan></text> 6.228 + </g> 6.229 + <path 6.230 + inkscape:connection-end="#rect6004" 6.231 + inkscape:connector-type="polyline" 6.232 + id="path6020" 6.233 + d="M 107.38242,311.15529 L 107.38242,327.53626" 6.234 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 6.235 + <rect 6.236 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 6.237 + id="rect6039" 6.238 + width="134.53746" 6.239 + height="44.537449" 6.240 + x="40.113571" 6.241 + y="389.57703" /> 6.242 + <text 6.243 + xml:space="preserve" 6.244 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 6.245 + x="64.797073" 6.246 + y="415.33771" 6.247 + id="text6041"><tspan 6.248 + sodipodi:role="line" 6.249 + id="tspan6043" 6.250 + x="64.797073" 6.251 + y="415.33771" 6.252 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 6.253 + <path 6.254 + inkscape:connection-end="#rect6039" 6.255 + inkscape:connector-type="polyline" 6.256 + id="path6045" 6.257 + d="M 107.38238,372.82195 L 107.38235,389.20301" 6.258 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 6.259 + <text 6.260 + xml:space="preserve" 6.261 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 6.262 + x="19.660461" 6.263 + y="231.36218" 6.264 + id="text6102"><tspan 6.265 + sodipodi:role="line" 6.266 + id="tspan6104" 6.267 + x="19.660461" 6.268 + y="231.36218">History in repository</tspan></text> 6.269 + <rect 6.270 + y="245.94225" 6.271 + x="249.28412" 6.272 + height="204.51619" 6.273 + width="174.36833" 6.274 + id="rect6140" 6.275 + style="fill:url(#linearGradient6996);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 6.276 + <g 6.277 + id="g6130" 6.278 + transform="translate(-45.67459,24.38544)"> 6.279 + <rect 6.280 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 6.281 + id="rect6106" 6.282 + width="134.53746" 6.283 + height="44.537449" 6.284 + x="314.87415" 6.285 + y="257.95059" /> 6.286 + <text 6.287 + xml:space="preserve" 6.288 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 6.289 + x="339.55664" 6.290 + y="283.7113" 6.291 + id="text6108"><tspan 6.292 + sodipodi:role="line" 6.293 + id="tspan6110" 6.294 + x="339.55664" 6.295 + y="283.7113" 6.296 + style="font-family:Courier">7b064d8bac5e</tspan></text> 6.297 + </g> 6.298 + <g 6.299 + id="g6135" 6.300 + transform="translate(-44.96042,49.83106)"> 6.301 + <rect 6.302 + inkscape:transform-center-y="102.85714" 6.303 + inkscape:transform-center-x="129.28571" 6.304 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 6.305 + id="rect6112" 6.306 + width="134.53746" 6.307 + height="44.537449" 6.308 + x="314.15985" 6.309 + y="326.52203" /> 6.310 + <text 6.311 + inkscape:transform-center-y="102.7311" 6.312 + inkscape:transform-center-x="128.69672" 6.313 + xml:space="preserve" 6.314 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 6.315 + x="338.84335" 6.316 + y="352.28271" 6.317 + id="text6114"><tspan 6.318 + sodipodi:role="line" 6.319 + id="tspan6116" 6.320 + x="338.84335" 6.321 + y="352.28271" 6.322 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 6.323 + </g> 6.324 + <text 6.325 + xml:space="preserve" 6.326 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 6.327 + x="268.63208" 6.328 + y="270.479" 6.329 + id="text6118"><tspan 6.330 + sodipodi:role="line" 6.331 + id="tspan6120" 6.332 + x="268.63208" 6.333 + y="270.479">First parent</tspan></text> 6.334 + <text 6.335 + xml:space="preserve" 6.336 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 6.337 + x="268.07544" 6.338 + y="364.49615" 6.339 + id="text6122"><tspan 6.340 + sodipodi:role="line" 6.341 + id="tspan6124" 6.342 + x="268.07544" 6.343 + y="364.49615">Second parent</tspan></text> 6.344 + <text 6.345 + xml:space="preserve" 6.346 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 6.347 + x="248.61746" 6.348 + y="231.36218" 6.349 + id="text6195"><tspan 6.350 + sodipodi:role="line" 6.351 + id="tspan6197" 6.352 + x="248.61746" 6.353 + y="231.36218">Parents of working directory</tspan></text> 6.354 + <path 6.355 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" 6.356 + d="M 268.82543,318.06163 L 175.02528,336.72225" 6.357 + id="path6266" 6.358 + inkscape:connector-type="polyline" 6.359 + inkscape:connection-end="#g6976" 6.360 + inkscape:connection-start="#g6130" /> 6.361 + <path 6.362 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 6.363 + d="M 665.12232,418.17579 L 665.12232,418.17579" 6.364 + id="path6270" 6.365 + inkscape:connector-type="polyline" /> 6.366 + </g> 6.367 +</svg>