Comment 2 for bug 272425
Revision history for this message
| Nazo (lovesyao) wrote Re: bzr merge fails with message "different rich-root support" | #2 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
0e1f616
(Get the code!)
Thank you for your reply.
I'm upgraded and it works with problem.
$ bzr merge -r39..40 lp:bbs2ch/0.4
+N defaults/
+N defaults/skin/
+N defaults/
R defaults/ => defaults.moved/
Conflict adding files to build. Moved to root.
Conflict adding files to chrome. Moved to root.
Conflict adding files to chrome.manifest. Moved to root.
Conflict adding files to components. Moved to root.
Conflict adding files to defaults. Moved to root.
Conflict adding files to defaults. Created directory.
Conflict because defaults is not versioned, but has versioned children. Versioned directory.
Conflict adding file defaults. Moved existing file to defaults.moved.
Conflict adding files to defaults/skin. Created directory.
Conflict because defaults/skin is not versioned, but has versioned children. Versioned directory.
Contents conflict in defaults/
Conflict adding files to history.txt. Moved to root.
Conflict adding files to install.rdf. Moved to root.
13 conflicts encountered.
$
lp:bbs2ch was branched from lp:~vcs-imports/bbs2ch/trunk and I develop in this branch.
lp:~vcs-imports/bbs2ch/trunk is imported with VCS import from http://
lp:bbs2ch/0.4 is pushed from local branched with bzr-svn from http://
http://