I have these folders: \tags\1.0 \trunk
I did have files in the 1.0 folder but copied them all into trunk and deleted everything from the 1.0 folder. Then I committed the deletes in the 1.0 folder. I've finished version 1.0 in trunk and copied it over to the 1.0 folder for archiving. When I try to commit the 1.0 folder contents, I get this error: Commit failed (details follow): Aborting commit: '/tags/1.0/Classes' remains in tree-conflict There are a few files in the Classes folder that have issues. I tracked them down. When I try to commit one of those files, this is the error I get: Entry for '/tags/1.0/Classes/TopicController.h' is marked as 'copied' but is not itself scheduled for addition. Perhaps you're committing a target that is inside an unversioned (or not-yet-versioned) directory? How is there a conflict when everything in the 1.0 folder was previously deleted? There shouldn't be anything to conflict with. How do I go about resolving the above issues? -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
