Language: C C++ D Haskell Lua OCaml PHP Perl Plain Text Python Ruby Scheme Tcl iona% iona% iona% rm -rf $WD/main.co $WD/main.bzr iona% bzr svn-import -v --all --layout=trunk -v $WD/lx-src-before.svn $WD/main.bzr Using repository layout: trunk0 Use 'bzr checkout' to create a working tree in the newly created branches. iona% bzr checkout $WD/main.bzr/trunk $WD/main.co iona% bzr ls $WD/main.co /tmp/migrate.lx/main.co/doc/ iona% ( cd $WD/main.co && bzr merge $WD/lx.bzr -r2..4 ) +N lx/ +N lx/examples/ +N lx/examples/a.lx.OTHER +N lx/src/ +N lx/src/Makefile.OTHER +N lx/src/lexer.lxi.OTHER +N lx/src/main.c.OTHER +N lx/src/parser.act +N lx/src/parser.sid Conflict adding files to lx. Moved to root. Conflict adding files to lx. Created directory. Conflict because lx is not versioned, but has versioned children. Versioned directory. Conflict adding files to lx/examples. Created directory. Conflict because lx/examples is not versioned, but has versioned children. Versioned directory. Contents conflict in lx/examples/a.lx Conflict adding files to lx/src. Created directory. Conflict because lx/src is not versioned, but has versioned children. Versioned directory. Contents conflict in lx/src/Makefile Contents conflict in lx/src/lexer.lxi Contents conflict in lx/src/main.c 11 conflicts encountered. iona* Private [?] Run code Submit