1. André Felipe Dias
  2. kick-start
  3. Issues
Issue #1 new

Problem in Reintegrate Example

André Felipe Dias
repo owner created an issue

{{{

!bash

$ scons pt_BR scons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... rst2html --language en --stylesheet-path pt_BR/style.css src/tasks/index.txt pt_BR/tasks/index.html src/tasks/index.txt:14: (WARNING/2) While executing:

svn merge --reintegrate file://$HOME/hello/branches/issue-2

the output changed:

--- wanted +++ actual @@ -1,5 +1,7 @@ --- Merging differences between repository URLs into '.': A hello.en.txt C hello.txt +--- Recording mergeinfo for merge between repository URLs into '.': + U . Summary of conflicts: Tree conflicts: 1

new output:

--- Merging differences between repository URLs into '.': A hello.en.txt C hello.txt --- Recording mergeinfo for merge between repository URLs into '.': U . Summary of conflicts: Tree conflicts: 1 Exiting due to level-2 (WARNING) system message. scons: *** [pt_BR/tasks/index.html] Error 1 scons: building terminated because of errors. }}}

Comments (0)

  1. Log in to comment