# HG changeset patch # User Bryan O'Sullivan # Date 1161198416 25200 # Node ID 272146fab009a8f7f1045086a626bec3b0bff304 # Parent 06383f9e46e42631ad8b677b4d6a0ca21644ea20 Add yet another illustration of the merge process. diff -r 06383f9e46e4 -r 272146fab009 en/Makefile --- a/en/Makefile Mon Oct 16 14:54:37 2006 -0700 +++ b/en/Makefile Wed Oct 18 12:06:56 2006 -0700 @@ -22,7 +22,8 @@ mq-stack.svg \ tour-history.svg \ tour-merge-sep-repos.svg \ - tour-merge-pull.svg + tour-merge-pull.svg \ + tour-merge-merge.svg example-sources := \ daily.files \ diff -r 06383f9e46e4 -r 272146fab009 en/tour-merge-merge.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/tour-merge-merge.svg Wed Oct 18 12:06:56 2006 -0700 @@ -0,0 +1,381 @@ + + + diff -r 06383f9e46e4 -r 272146fab009 en/tour-merge.tex --- a/en/tour-merge.tex Mon Oct 16 14:54:37 2006 -0700 +++ b/en/tour-merge.tex Wed Oct 18 12:06:56 2006 -0700 @@ -72,12 +72,22 @@ update to the new tip? \interaction{tour.merge.update} Mercurial is telling us that the \hgcmd{update} command won't do a -merge. Instead, we use the \hgcmd{merge} command to merge the two -heads. +merge; it won't update the working directory when it thinks we might +be wanting to do a merge, unless we force it to do so. Instead, we +use the \hgcmd{merge} command to merge the two heads. \interaction{tour.merge.merge} + +\begin{figure}[ht] + \centering + \grafix{tour-merge-merge} + \caption{Working directory and repository during merge, and + following commit} + \label{fig:tour-merge:merge} +\end{figure} + This updates the working directory so that it contains changes from -both heads, which is reflected in both the output of \hgcmd{parents} -and the contents of \filename{hello.c}. +\emph{both} heads, which is reflected in both the output of +\hgcmd{parents} and the contents of \filename{hello.c}. \interaction{tour.merge.parents} Whenever we've done a merge, \hgcmd{parents} will display two parents until we \hgcmd{commit} the results of the merge.