hgbook
diff en/daily.tex @ 519:a529952fce96
changed "un tag" to "una etiqueta". Same thing for
"unos tags"
"un tag"
"el tag"
"los tags"
"de tag"
"de tags"
"unos tags"
"un tag"
"el tag"
"los tags"
"de tag"
"de tags"
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Sun Jan 18 22:21:43 2009 -0500 (2009-01-18) |
parents | abebe72451d6 |
children |
line diff
1.1 --- a/en/daily.tex Sun May 27 09:48:47 2007 -0700 1.2 +++ b/en/daily.tex Sun Jan 18 22:21:43 2009 -0500 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