thakis added a comment.


$ svn merge -c -329714 .

- Reverse-merging r329714 into '.':

A    test/Frontend/ftime-report-template-decl.cpp

- Recording mergeinfo for reverse merge of r329714 into '.': U   .

$ svn merge -c -329693 .

- Reverse-merging r329693 into '.':

U    test/Frontend/ftime-report-template-decl.cpp

- Recording mergeinfo for reverse merge of r329693 into '.': U   .

$ svn merge -c -329684 .

- Reverse-merging r329684 into '.':

D    test/Frontend/ftime-report-template-decl.cpp
U    include/clang/Frontend/FrontendAction.h
U    lib/Parse/ParseTemplate.cpp
U    lib/Frontend/FrontendAction.cpp
U    lib/Lex/Pragma.cpp
U    lib/CodeGen/CodeGenAction.cpp
U    include/clang/Parse/Parser.h
U    include/clang/Sema/Sema.h
U    include/clang/Lex/HeaderSearch.h
U    lib/Parse/Parser.cpp
U    lib/Frontend/ASTMerge.cpp
U    lib/Frontend/FrontendActions.cpp
U    lib/Frontend/CompilerInstance.cpp
U    lib/Sema/SemaChecking.cpp
U    lib/Sema/SemaExpr.cpp
U    lib/Sema/Sema.cpp
U    lib/Sema/SemaDecl.cpp
U    lib/Sema/SemaTemplate.cpp
U    lib/Lex/PPMacroExpansion.cpp
U    lib/Lex/HeaderSearch.cpp

- Recording mergeinfo for reverse merge of r329684 into '.': U   .

$ svn commit -m 'Revert r329684 (and follow-ups 329693, 329714). See discussion 
Sending        include/clang/Frontend/FrontendAction.h
Sending        include/clang/Lex/HeaderSearch.h
Sending        include/clang/Parse/Parser.h
Sending        include/clang/Sema/Sema.h
Sending        lib/CodeGen/CodeGenAction.cpp
Sending        lib/Frontend/ASTMerge.cpp
Sending        lib/Frontend/CompilerInstance.cpp
Sending        lib/Frontend/FrontendAction.cpp
Sending        lib/Frontend/FrontendActions.cpp
Sending        lib/Lex/HeaderSearch.cpp
Sending        lib/Lex/PPMacroExpansion.cpp
Sending        lib/Lex/Pragma.cpp
Sending        lib/Parse/ParseTemplate.cpp
Sending        lib/Parse/Parser.cpp
Sending        lib/Sema/Sema.cpp
Sending        lib/Sema/SemaChecking.cpp
Sending        lib/Sema/SemaDecl.cpp
Sending        lib/Sema/SemaExpr.cpp
Sending        lib/Sema/SemaTemplate.cpp
Transmitting file data ...................done
Committing transaction...
Committed revision 329739.


cfe-commits mailing list

Reply via email to