"myvn up" just defers to svn. svn >=1.5 will prompt for conflict resolution. svn <1.5 will just print the C, and block commit.
On 8/27/09 22:43, Mark S. Miller wrote:
I just had a strange myvn exprience: $ tools/myvn up U tests/com/google/caja/plugin/domita_test.html U tests/com/google/caja/plugin/CssRuleRewriterTest.java U tests/com/google/caja/plugin/CssRewriterTest.java U tests/com/google/caja/plugin/templates/TemplateCompilerTest.java A tests/com/google/caja/plugin/templates/JsConcatenatorTest.java U tests/com/google/caja/AllTests.java U src/com/google/caja/render/SourceSnippetRenderer.java U src/com/google/caja/parser/html/XmlElementStack.java U src/com/google/caja/parser/html/AbstractElementStack.java U src/com/google/caja/parser/html/Html5ElementStack.java U src/com/google/caja/parser/MutableParseTreeNode.java U src/com/google/caja/plugin/CssRuleRewriter.java U src/com/google/caja/plugin/html-sanitizer.js U src/com/google/caja/plugin/stages/ValidateCssStage.java C src/com/google/caja/plugin/domita.js U src/com/google/caja/plugin/CssRewriter.java U src/com/google/caja/plugin/templates/QuasiUtil.java U src/com/google/caja/plugin/templates/TemplateCompiler.java U src/com/google/caja/plugin/templates/SafeCssMaker.java A src/com/google/caja/plugin/templates/HtmlAttributeRewriter.java A src/com/google/caja/plugin/templates/JsConcatenator.java U src/com/google/caja/tools/DocletAntTask.java U src/com/google/caja/config/ConfigUtil.java U src/com/google/caja/reporting/Renderable.java Updated to revision 3670. Notice the silent "C" above, meaning conflict. myvn did not prompt me to resolve the conflict. Since normally it does, I mistakenly took its silence to indicate lack of conflict and only found out otherwise when a build failed. Is this a myvn bug? An svn bug? Do I have something misconfigured? Or do I have the wrong expectations?
