Talk:Hg rename issues

From Genunix

For the 14:23 7 Jun draft, I tried to keep some of the simplicity of Quenelle's wording, while retaining what I think are important details. I think it's simpler than the original draft. --Kupfer

Good job Mike! I added one more sentence to the description of a namespace-only conflict. --Quenelle 14:29, 8 June 2007 (PDT)

So if I understand correctly, the new sentence is saying that what's important is whether one of those 3 operations happens, not what the SCM system called it or how we got there. If I'm misunderstanding, let me know. --Kupfer 14:42, 8 June 2007 (PDT)

Yup, that's it. I just wanted to spell out what we consider a "conflict", in a SCM independant way. --Quenelle 14:52, 8 June 2007 (PDT)

[edit]

"-only"

I originally included "-only" in conflict descriptions (e.g., "content-only") to draw a firm line between content conflicts and namespace conflicts. But I think it's confusing--it implies that there should be different behavior if a file has both content and namespace conflicts, which wasn't my intent. --Kupfer 11:02, 13 June 2007 (PDT)

Retrieved from "http://www.genunix.org/wiki/index.php/Talk:Hg_rename_issues"