hgbook
changeset 275:96ea24a916f9
Merge with myself.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Nov 26 20:42:36 2007 -0800 (2007-11-26) |
parents | b049cb10bde3 00f69e8825c5 |
children | 92660e72d6bf |
files |
line diff
1.1 --- a/en/daily.tex Mon Nov 26 20:42:17 2007 -0800 1.2 +++ b/en/daily.tex Mon Nov 26 20:42:36 2007 -0800 1.3 @@ -337,22 +337,8 @@ 1.4 names when it merges changesets that contain divergent renames. 1.5 \interaction{rename.divergent.merge} 1.6 1.7 -I personally find this behaviour quite surprising, which is why I 1.8 -wanted to explicitly mention it here. I would have expected Mercurial 1.9 -to prompt me with a three-way choice instead: do I want to keep only 1.10 -\filename{bar}, only \filename{quux}, or both? 1.11 - 1.12 -In practice, when you rename a source file, it is likely that you will 1.13 -also modify another file (such as a makefile) that knows how to build 1.14 -the source file. So what will happen if Anne renames a file and edits 1.15 -\filename{Makefile} to build it under its new name, while Bob does the 1.16 -same, but chooses a different name for the file, is that after the 1.17 -merge, there will be two copies of the source file in the working 1.18 -directory under different names, \emph{and} a conflict in the section 1.19 -of the \filename{Makefile} that both Bob and Anne edited. 1.20 - 1.21 -This behaviour is considered surprising by other people, too: 1.22 -see~\bug{455} for details. 1.23 +Notice that Mercurial does warn about the divergent renames, but it 1.24 +leaves it up to you to do something about the divergence after the merge. 1.25 1.26 \subsection{Convergent renames and merging} 1.27
2.1 --- a/en/examples/bisect.search.init.out Mon Nov 26 20:42:17 2007 -0800 2.2 +++ b/en/examples/bisect.search.init.out Mon Nov 26 20:42:36 2007 -0800 2.3 @@ -1,1 +1,3 @@ 2.4 2.5 + 2.6 +
3.1 --- a/en/examples/branch-named.create.out Mon Nov 26 20:42:17 2007 -0800 3.2 +++ b/en/examples/branch-named.create.out Mon Nov 26 20:42:36 2007 -0800 3.3 @@ -1,3 +1,4 @@ 3.4 $ \textbf{hg branch foo} 3.5 +marked working directory as branch foo 3.6 $ \textbf{hg branch} 3.7 foo
4.1 --- a/en/examples/branch-named.parents.out Mon Nov 26 20:42:17 2007 -0800 4.2 +++ b/en/examples/branch-named.parents.out Mon Nov 26 20:42:36 2007 -0800 4.3 @@ -8,5 +8,5 @@ 4.4 4.5 $ \textbf{hg branches} 4.6 bar 4.7 -foo 4.8 -default 4.9 +foo (inactive) 4.10 +default (inactive)
5.1 --- a/en/examples/branch-named.rebranch.out Mon Nov 26 20:42:17 2007 -0800 5.2 +++ b/en/examples/branch-named.rebranch.out Mon Nov 26 20:42:36 2007 -0800 5.3 @@ -1,6 +1,7 @@ 5.4 $ \textbf{hg branch} 5.5 foo 5.6 $ \textbf{hg branch bar} 5.7 +marked working directory as branch bar 5.8 $ \textbf{echo new file > newfile} 5.9 $ \textbf{hg commit -A -m 'Third commit'} 5.10 adding newfile
6.1 --- a/en/examples/daily.revert.rename-orig.out Mon Nov 26 20:42:17 2007 -0800 6.2 +++ b/en/examples/daily.revert.rename-orig.out Mon Nov 26 20:42:36 2007 -0800 6.3 @@ -1,3 +1,4 @@ 6.4 $ \textbf{hg revert file} 6.5 +no changes needed to file 6.6 $ \textbf{hg status} 6.7 ? new-file
7.1 --- a/en/examples/daily.revert.rename.out Mon Nov 26 20:42:17 2007 -0800 7.2 +++ b/en/examples/daily.revert.rename.out Mon Nov 26 20:42:36 2007 -0800 7.3 @@ -1,5 +1,4 @@ 7.4 $ \textbf{hg rename file new-file} 7.5 $ \textbf{hg revert new-file} 7.6 $ \textbf{hg status} 7.7 -R file 7.8 ? new-file
8.1 --- a/en/examples/extdiff.extdiff-ctx.out Mon Nov 26 20:42:17 2007 -0800 8.2 +++ b/en/examples/extdiff.extdiff-ctx.out Mon Nov 26 20:42:36 2007 -0800 8.3 @@ -1,8 +1,5 @@ 8.4 $ \textbf{hg extdiff -o -NprcC5} 8.5 -making snapshot of 1 files from rev 8.6 -making snapshot of 1 files from working dir 8.7 -diff -NprcC5 a./myfile a/myfile 8.8 -*** a./myfile Sat May 26 18:14:31 2007 8.9 + 8.10 8.11 *************** 8.12 *** 1 ****
9.1 --- a/en/examples/extdiff.extdiff.out Mon Nov 26 20:42:17 2007 -0800 9.2 +++ b/en/examples/extdiff.extdiff.out Mon Nov 26 20:42:36 2007 -0800 9.3 @@ -1,7 +1,4 @@ 9.4 $ \textbf{hg extdiff} 9.5 -making snapshot of 1 files from rev 9.6 -making snapshot of 1 files from working dir 9.7 -diff -Npru a./myfile a/myfile 9.8 9.9 9.10 @@ -1 +1,2 @@
10.1 --- a/en/examples/hook.msglen.go.out Mon Nov 26 20:42:17 2007 -0800 10.2 +++ b/en/examples/hook.msglen.go.out Mon Nov 26 20:42:36 2007 -0800 10.3 @@ -4,7 +4,7 @@ 10.4 $ \textbf{echo a > a} 10.5 $ \textbf{hg add a} 10.6 $ \textbf{hg commit -A -m 'too short'} 10.7 -abort: pretxncommit.msglen hook exited with status 1 10.8 transaction abort! 10.9 rollback completed 10.10 +abort: pretxncommit.msglen hook exited with status 1 10.11 $ \textbf{hg commit -A -m 'long enough'}
11.1 --- a/en/examples/hook.simple.pretxncommit.out Mon Nov 26 20:42:17 2007 -0800 11.2 +++ b/en/examples/hook.simple.pretxncommit.out Mon Nov 26 20:42:36 2007 -0800 11.3 @@ -5,9 +5,9 @@ 11.4 $ \textbf{echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' >> .hg/hgrc} 11.5 $ \textbf{echo a >> a} 11.6 $ \textbf{hg commit -m 'i am not mentioning a bug id'} 11.7 -abort: pretxncommit.bug_id_required hook exited with status 1 11.8 transaction abort! 11.9 rollback completed 11.10 +abort: pretxncommit.bug_id_required hook exited with status 1 11.11 $ \textbf{hg commit -m 'i refer you to bug 666'} 11.12 committed 11.13
12.1 --- a/en/examples/hook.ws.better.out Mon Nov 26 20:42:17 2007 -0800 12.2 +++ b/en/examples/hook.ws.better.out Mon Nov 26 20:42:36 2007 -0800 12.3 @@ -5,13 +5,13 @@ 12.4 $ \textbf{hg commit -A -m 'add new line with trailing whitespace'} 12.5 a, line 2: trailing whitespace added 12.6 commit message saved to .hg/commit.save 12.7 -abort: pretxncommit.whitespace hook exited with status 1 12.8 transaction abort! 12.9 rollback completed 12.10 +abort: pretxncommit.whitespace hook exited with status 1 12.11 $ \textbf{sed -i 's, *$,,' a} 12.12 $ \textbf{hg commit -A -m 'trimmed trailing whitespace'} 12.13 a, line 2: trailing whitespace added 12.14 commit message saved to .hg/commit.save 12.15 -abort: pretxncommit.whitespace hook exited with status 1 12.16 transaction abort! 12.17 rollback completed 12.18 +abort: pretxncommit.whitespace hook exited with status 1
13.1 --- a/en/examples/hook.ws.simple.out Mon Nov 26 20:42:17 2007 -0800 13.2 +++ b/en/examples/hook.ws.simple.out Mon Nov 26 20:42:36 2007 -0800 13.3 @@ -4,8 +4,8 @@ 13.4 $ \textbf{echo 'a ' > a} 13.5 $ \textbf{hg commit -A -m 'test with trailing whitespace'} 13.6 adding a 13.7 -abort: pretxncommit.whitespace hook exited with status 1 13.8 transaction abort! 13.9 rollback completed 13.10 +abort: pretxncommit.whitespace hook exited with status 1 13.11 $ \textbf{echo 'a' > a} 13.12 $ \textbf{hg commit -A -m 'drop trailing whitespace and try again'}
14.1 --- a/en/examples/mq.id.output.out Mon Nov 26 20:42:17 2007 -0800 14.2 +++ b/en/examples/mq.id.output.out Mon Nov 26 20:42:36 2007 -0800 14.3 @@ -7,7 +7,7 @@ 14.4 tag: qbase 14.5 user: Bryan O'Sullivan <bos@serpentine.com> 14.6 14.7 -summary: patch queue: first.patch 14.8 +summary: [mq]: first.patch 14.9 14.10 changeset: 14.11 tag: qtip 14.12 @@ -15,7 +15,7 @@ 14.13 tag: tip 14.14 user: Bryan O'Sullivan <bos@serpentine.com> 14.15 14.16 -summary: patch queue: second.patch 14.17 +summary: [mq]: second.patch 14.18 14.19 $ \textbf{hg export second.patch} 14.20 # HG changeset patch 14.21 @@ -23,7 +23,7 @@ 14.22 14.23 # Node ID 14.24 # Parent 14.25 -patch queue: second.patch 14.26 +[mq]: second.patch 14.27 14.28 diff -r -r other.c 14.29
15.1 --- a/en/examples/mq.qinit-help.help.out Mon Nov 26 20:42:17 2007 -0800 15.2 +++ b/en/examples/mq.qinit-help.help.out Mon Nov 26 20:42:36 2007 -0800 15.3 @@ -5,8 +5,9 @@ 15.4 15.5 The queue repository is unversioned by default. If -c is 15.6 specified, qinit will create a separate nested repository 15.7 - for patches. Use qcommit to commit changes to this queue 15.8 - repository. 15.9 + for patches (qinit -c may also be run later to convert 15.10 + an unversioned patch repository into a versioned one). 15.11 + You can use qcommit to commit changes to this queue repository. 15.12 15.13 options: 15.14
16.1 --- a/en/examples/mq.tutorial.qnew.out Mon Nov 26 20:42:17 2007 -0800 16.2 +++ b/en/examples/mq.tutorial.qnew.out Mon Nov 26 20:42:36 2007 -0800 16.3 @@ -14,7 +14,7 @@ 16.4 tag: qbase 16.5 user: Bryan O'Sullivan <bos@serpentine.com> 16.6 16.7 -summary: New patch: first.patch 16.8 +summary: [mq]: first.patch 16.9 16.10 $ \textbf{ls .hg/patches} 16.11 first.patch series status
17.1 --- a/en/examples/mq.tutorial.qnew2.out Mon Nov 26 20:42:17 2007 -0800 17.2 +++ b/en/examples/mq.tutorial.qnew2.out Mon Nov 26 20:42:36 2007 -0800 17.3 @@ -1,16 +1,16 @@ 17.4 $ \textbf{hg qnew second.patch} 17.5 $ \textbf{hg log --style=compact --limit=2} 17.6 2[qtip,second.patch,tip] 17.7 - New patch: second.patch 17.8 + [mq]: second.patch 17.9 17.10 1[first.patch,qbase] 17.11 - patch queue: first.patch 17.12 + [mq]: first.patch 17.13 17.14 $ \textbf{echo 'line 4' >> file1} 17.15 $ \textbf{hg qrefresh} 17.16 $ \textbf{hg tip --style=compact --patch} 17.17 2[qtip,second.patch,tip] 17.18 - patch queue: second.patch 17.19 + [mq]: second.patch 17.20 17.21 diff -r -r file1 17.22
18.1 --- a/en/examples/mq.tutorial.qrefresh.out Mon Nov 26 20:42:17 2007 -0800 18.2 +++ b/en/examples/mq.tutorial.qrefresh.out Mon Nov 26 20:42:36 2007 -0800 18.3 @@ -10,7 +10,7 @@ 18.4 $ \textbf{hg diff} 18.5 $ \textbf{hg tip --style=compact --patch} 18.6 1[qtip,first.patch,tip,qbase] 18.7 - patch queue: first.patch 18.8 + [mq]: first.patch 18.9 18.10 diff -r -r file1 18.11
19.1 --- a/en/examples/mq.tutorial.qrefresh2.out Mon Nov 26 20:42:17 2007 -0800 19.2 +++ b/en/examples/mq.tutorial.qrefresh2.out Mon Nov 26 20:42:36 2007 -0800 19.3 @@ -4,7 +4,7 @@ 19.4 $ \textbf{hg qrefresh} 19.5 $ \textbf{hg tip --style=compact --patch} 19.6 1[qtip,first.patch,tip,qbase] 19.7 - patch queue: first.patch 19.8 + [mq]: first.patch 19.9 19.10 diff -r -r file1 19.11
20.1 --- a/en/examples/rename.divergent.merge.out Mon Nov 26 20:42:17 2007 -0800 20.2 +++ b/en/examples/rename.divergent.merge.out Mon Nov 26 20:42:36 2007 -0800 20.3 @@ -17,6 +17,9 @@ 20.4 added 1 changesets with 1 changes to 1 files (+1 heads) 20.5 (run 'hg heads' to see heads, 'hg merge' to merge) 20.6 $ \textbf{hg merge} 20.7 +warning: detected divergent renames of foo to: 20.8 + bar 20.9 + quux 20.10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 20.11 (branch merge, don't forget to commit) 20.12 $ \textbf{ls}
21.1 --- a/en/examples/tour.version.out Mon Nov 26 20:42:17 2007 -0800 21.2 +++ b/en/examples/tour.version.out Mon Nov 26 20:42:36 2007 -0800 21.3 @@ -1,6 +1,6 @@ 21.4 $ \textbf{hg version} 21.5 -Mercurial Distributed SCM (version ) 21.6 +Mercurial Distributed SCM (version +20071107) 21.7 21.8 -Copyright (C) 2005, 2006 Matt Mackall <mpm@selenic.com> 21.9 +Copyright (C) 2005-2007 Matt Mackall <mpm@selenic.com> and others 21.10 This is free software; see the source for copying conditions. There is NO 21.11 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.