# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1196138556 28800
# Node ID 96ea24a916f9a1b023c72970fb1911a2ae8f8dbd
# Parent  b049cb10bde3f2ed530b5222e42468318fd7533f# Parent  00f69e8825c599e50a994f61deac040347e78439
Merge with myself.

diff -r b049cb10bde3 -r 96ea24a916f9 en/daily.tex
--- a/en/daily.tex	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/daily.tex	Mon Nov 26 20:42:36 2007 -0800
@@ -337,22 +337,8 @@
 names when it merges changesets that contain divergent renames.
 \interaction{rename.divergent.merge}
 
-I personally find this behaviour quite surprising, which is why I
-wanted to explicitly mention it here.  I would have expected Mercurial
-to prompt me with a three-way choice instead: do I want to keep only
-\filename{bar}, only \filename{quux}, or both?
-
-In practice, when you rename a source file, it is likely that you will
-also modify another file (such as a makefile) that knows how to build
-the source file.  So what will happen if Anne renames a file and edits
-\filename{Makefile} to build it under its new name, while Bob does the
-same, but chooses a different name for the file, is that after the
-merge, there will be two copies of the source file in the working
-directory under different names, \emph{and} a conflict in the section
-of the \filename{Makefile} that both Bob and Anne edited.
-
-This behaviour is considered surprising by other people, too:
-see~\bug{455} for details.
+Notice that Mercurial does warn about the divergent renames, but it
+leaves it up to you to do something about the divergence after the merge.
 
 \subsection{Convergent renames and merging}
 
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/bisect.search.init.out
--- a/en/examples/bisect.search.init.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/bisect.search.init.out	Mon Nov 26 20:42:36 2007 -0800
@@ -1,1 +1,3 @@
 
+
+
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/branch-named.create.out
--- a/en/examples/branch-named.create.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/branch-named.create.out	Mon Nov 26 20:42:36 2007 -0800
@@ -1,3 +1,4 @@
 $ \textbf{hg branch foo}
+marked working directory as branch foo
 $ \textbf{hg branch}
 foo
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/branch-named.parents.out
--- a/en/examples/branch-named.parents.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/branch-named.parents.out	Mon Nov 26 20:42:36 2007 -0800
@@ -8,5 +8,5 @@
 
 $ \textbf{hg branches}
 bar                            
-foo                            
-default                        
+foo                             (inactive)
+default                         (inactive)
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/branch-named.rebranch.out
--- a/en/examples/branch-named.rebranch.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/branch-named.rebranch.out	Mon Nov 26 20:42:36 2007 -0800
@@ -1,6 +1,7 @@
 $ \textbf{hg branch}
 foo
 $ \textbf{hg branch bar}
+marked working directory as branch bar
 $ \textbf{echo new file > newfile}
 $ \textbf{hg commit -A -m 'Third commit'}
 adding newfile
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/daily.revert.rename-orig.out
--- a/en/examples/daily.revert.rename-orig.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/daily.revert.rename-orig.out	Mon Nov 26 20:42:36 2007 -0800
@@ -1,3 +1,4 @@
 $ \textbf{hg revert file}
+no changes needed to file
 $ \textbf{hg status}
 ? new-file
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/daily.revert.rename.out
--- a/en/examples/daily.revert.rename.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/daily.revert.rename.out	Mon Nov 26 20:42:36 2007 -0800
@@ -1,5 +1,4 @@
 $ \textbf{hg rename file new-file}
 $ \textbf{hg revert new-file}
 $ \textbf{hg status}
-R file
 ? new-file
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/extdiff.extdiff-ctx.out
--- a/en/examples/extdiff.extdiff-ctx.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/extdiff.extdiff-ctx.out	Mon Nov 26 20:42:36 2007 -0800
@@ -1,8 +1,5 @@
 $ \textbf{hg extdiff -o -NprcC5}
-making snapshot of 1 files from rev 
-making snapshot of 1 files from working dir
-diff -NprcC5 a./myfile a/myfile
-*** a./myfile	Sat May 26 18:14:31 2007
+
 
 ***************
 *** 1 ****
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/extdiff.extdiff.out
--- a/en/examples/extdiff.extdiff.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/extdiff.extdiff.out	Mon Nov 26 20:42:36 2007 -0800
@@ -1,7 +1,4 @@
 $ \textbf{hg extdiff}
-making snapshot of 1 files from rev 
-making snapshot of 1 files from working dir
-diff -Npru a./myfile a/myfile
 
 
 @@ -1 +1,2 @@
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/hook.msglen.go.out
--- a/en/examples/hook.msglen.go.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/hook.msglen.go.out	Mon Nov 26 20:42:36 2007 -0800
@@ -4,7 +4,7 @@
 $ \textbf{echo a > a}
 $ \textbf{hg add a}
 $ \textbf{hg commit -A -m 'too short'}
-abort: pretxncommit.msglen hook exited with status 1
 transaction abort!
 rollback completed
+abort: pretxncommit.msglen hook exited with status 1
 $ \textbf{hg commit -A -m 'long enough'}
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/hook.simple.pretxncommit.out
--- a/en/examples/hook.simple.pretxncommit.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/hook.simple.pretxncommit.out	Mon Nov 26 20:42:36 2007 -0800
@@ -5,9 +5,9 @@
 $ \textbf{echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' >> .hg/hgrc}
 $ \textbf{echo a >> a}
 $ \textbf{hg commit -m 'i am not mentioning a bug id'}
-abort: pretxncommit.bug_id_required hook exited with status 1
 transaction abort!
 rollback completed
+abort: pretxncommit.bug_id_required hook exited with status 1
 $ \textbf{hg commit -m 'i refer you to bug 666'}
 committed 
 
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/hook.ws.better.out
--- a/en/examples/hook.ws.better.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/hook.ws.better.out	Mon Nov 26 20:42:36 2007 -0800
@@ -5,13 +5,13 @@
 $ \textbf{hg commit -A -m 'add new line with trailing whitespace'}
 a, line 2: trailing whitespace added
 commit message saved to .hg/commit.save
-abort: pretxncommit.whitespace hook exited with status 1
 transaction abort!
 rollback completed
+abort: pretxncommit.whitespace hook exited with status 1
 $ \textbf{sed -i 's, *$,,' a}
 $ \textbf{hg commit -A -m 'trimmed trailing whitespace'}
 a, line 2: trailing whitespace added
 commit message saved to .hg/commit.save
-abort: pretxncommit.whitespace hook exited with status 1
 transaction abort!
 rollback completed
+abort: pretxncommit.whitespace hook exited with status 1
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/hook.ws.simple.out
--- a/en/examples/hook.ws.simple.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/hook.ws.simple.out	Mon Nov 26 20:42:36 2007 -0800
@@ -4,8 +4,8 @@
 $ \textbf{echo 'a ' > a}
 $ \textbf{hg commit -A -m 'test with trailing whitespace'}
 adding a
-abort: pretxncommit.whitespace hook exited with status 1
 transaction abort!
 rollback completed
+abort: pretxncommit.whitespace hook exited with status 1
 $ \textbf{echo 'a' > a}
 $ \textbf{hg commit -A -m 'drop trailing whitespace and try again'}
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/mq.id.output.out
--- a/en/examples/mq.id.output.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/mq.id.output.out	Mon Nov 26 20:42:36 2007 -0800
@@ -7,7 +7,7 @@
 tag:         qbase
 user:        Bryan O'Sullivan <bos@serpentine.com>
 
-summary:     patch queue: first.patch
+summary:     [mq]: first.patch
 
 changeset:   
 tag:         qtip
@@ -15,7 +15,7 @@
 tag:         tip
 user:        Bryan O'Sullivan <bos@serpentine.com>
 
-summary:     patch queue: second.patch
+summary:     [mq]: second.patch
 
 $ \textbf{hg export second.patch}
 # HG changeset patch
@@ -23,7 +23,7 @@
 
 # Node ID 
 # Parent  
-patch queue: second.patch
+[mq]: second.patch
 
 diff -r  -r  other.c
 
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/mq.qinit-help.help.out
--- a/en/examples/mq.qinit-help.help.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/mq.qinit-help.help.out	Mon Nov 26 20:42:36 2007 -0800
@@ -5,8 +5,9 @@
 
     The queue repository is unversioned by default. If -c is
     specified, qinit will create a separate nested repository
-    for patches. Use qcommit to commit changes to this queue
-    repository.
+    for patches (qinit -c may also be run later to convert
+    an unversioned patch repository into a versioned one).
+    You can use qcommit to commit changes to this queue repository.
 
 options:
 
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/mq.tutorial.qnew.out
--- a/en/examples/mq.tutorial.qnew.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/mq.tutorial.qnew.out	Mon Nov 26 20:42:36 2007 -0800
@@ -14,7 +14,7 @@
 tag:         qbase
 user:        Bryan O'Sullivan <bos@serpentine.com>
 
-summary:     New patch: first.patch
+summary:     [mq]: first.patch
 
 $ \textbf{ls .hg/patches}
 first.patch  series  status
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/mq.tutorial.qnew2.out
--- a/en/examples/mq.tutorial.qnew2.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/mq.tutorial.qnew2.out	Mon Nov 26 20:42:36 2007 -0800
@@ -1,16 +1,16 @@
 $ \textbf{hg qnew second.patch}
 $ \textbf{hg log --style=compact --limit=2}
 2[qtip,second.patch,tip]   
-  New patch: second.patch
+  [mq]: second.patch
 
 1[first.patch,qbase]   
-  patch queue: first.patch
+  [mq]: first.patch
 
 $ \textbf{echo 'line 4' >> file1}
 $ \textbf{hg qrefresh}
 $ \textbf{hg tip --style=compact --patch}
 2[qtip,second.patch,tip]   
-  patch queue: second.patch
+  [mq]: second.patch
 
 diff -r  -r  file1
 
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/mq.tutorial.qrefresh.out
--- a/en/examples/mq.tutorial.qrefresh.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/mq.tutorial.qrefresh.out	Mon Nov 26 20:42:36 2007 -0800
@@ -10,7 +10,7 @@
 $ \textbf{hg diff}
 $ \textbf{hg tip --style=compact --patch}
 1[qtip,first.patch,tip,qbase]   
-  patch queue: first.patch
+  [mq]: first.patch
 
 diff -r  -r  file1
 
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/mq.tutorial.qrefresh2.out
--- a/en/examples/mq.tutorial.qrefresh2.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/mq.tutorial.qrefresh2.out	Mon Nov 26 20:42:36 2007 -0800
@@ -4,7 +4,7 @@
 $ \textbf{hg qrefresh}
 $ \textbf{hg tip --style=compact --patch}
 1[qtip,first.patch,tip,qbase]   
-  patch queue: first.patch
+  [mq]: first.patch
 
 diff -r  -r  file1
 
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/rename.divergent.merge.out
--- a/en/examples/rename.divergent.merge.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/rename.divergent.merge.out	Mon Nov 26 20:42:36 2007 -0800
@@ -17,6 +17,9 @@
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ \textbf{hg merge}
+warning: detected divergent renames of foo to:
+ bar
+ quux
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 $ \textbf{ls}
diff -r b049cb10bde3 -r 96ea24a916f9 en/examples/tour.version.out
--- a/en/examples/tour.version.out	Mon Nov 26 20:42:17 2007 -0800
+++ b/en/examples/tour.version.out	Mon Nov 26 20:42:36 2007 -0800
@@ -1,6 +1,6 @@
 $ \textbf{hg version}
-Mercurial Distributed SCM (version )
+Mercurial Distributed SCM (version +20071107)
 
-Copyright (C) 2005, 2006 Matt Mackall <mpm@selenic.com>
+Copyright (C) 2005-2007 Matt Mackall <mpm@selenic.com> and others
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.