Re: how to repair this?
Jeroen Baten <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.cvs2svn.user |
|---|---|
| Message-ID | <[email protected]> |
Hello Michael and all,
To sum up the problem in one line: I can't seem to get rid of a certain
tag that is overlapping with other tags. I have tried to rename the tag
and remove the old one but withour succes.
Can you help me?
Is there an option in cvs2svn to 'ignore/fix' this error.
It is an old tag and not important anymore but I would really like to
convert this repo.
Below the requested info as mentioned in your FAQ.
Kind regards,
Jeroen Baten
=========================================
Exactly what version of cvs2svn are you using?
cvs2svn version 2.3.0
What platform are you using (Linux, BSD, Windows, etc.)?
Linux, Ubuntu 10.04.2 LTS
What python version (e.g., type python --version)?
Python 2.6.5
What is the exact command line that you used to start the conversion? If
you used the --options option, please attach a copy of the options file
that you used.
cvs2svn --pass=1:3 --retain-conflicting-attic-files
--encoding=ascii --encoding=utf8 --encoding=utf16
--fallback-encoding=utf8 --dumpfile=svndump
--write-symbol-info=symbol-info.txt cvsroot
What happened when you ran the program? How did that differ from what
you wanted/expected? Include transcripts and/or error output if available.
=========================================
----- pass 3 (CollateSymbolsPass) -----
Checking for forced tags with commits...
The following paths are not disjoint:
Path tags/csource contains the following other paths:
tags/csource/BasicHTML, tags/csource/IzInit, tags/csource/Login,
tags/csource/include, tags/csource/izstammesos, tags/csource/org,
tags/csource/zoekpatient
=========================================
After the first occurence of this error I did a:
cvs rtag -r csource csource/org csource
cvs rtag -d csource csource
=========================================
Still, the symbol-info.txt file shows the following:
0 csource tag tags/csource .trunk.
# 'csource' is a tag in 11 files, a branch in 0 files, a trivial
import in 0 files, a pure import in 0 files, and has commits in 0 files
# Possible parents:
# .trunk. : 11
# TRY_2_MERGE_epd_1_7_r02 : 8
# TRY_MERGE_epd_1_7 : 8
# calendar_update_20080707 : 5
# mesos2003_1_1 : 4
# mesos2003_1_2 : 4
=========================================
I checked out the tree with this tag and it is empty.
I can't seem to get rid of this 'csource' tag.
On 21-04-11 12:59, Michael Haggerty wrote:
> On 04/21/2011 09:39 AM, Jeroen Baten wrote:
>> in pass 3 of cvs2svn:
>>
>> Checking for forced tags with commits...
>> The following paths are not disjoint:
>> Path tags/csource contains the following other paths:
>> tags/csource/BasicHTML, tags/csource/IzInit, tags/csource/Login,
>> tags/csource/include, tags/csource/izstammesos, tags/csource/zoekpatient
>> Please fix the above errors and restart CollateSymbolsPass
>>
>> how can I fix this?
> You probably tried to have cvs2svn write one tag to tags/csource and
> other tags to tags/csource/BasicHTML etc. The problem is that these
> paths overlap. Move the one tag from tags/csource to
> tags/csource/SOMEOTHERPATH and the problem should be solved.
>
> If not, please include more information in your followup posts (the FAQ
> describes the kind of information that we need).
>
> Michael
>
--
Jeroen Baten
Hoofd Produktontwikkeling
Eenheid ICT, Productontwikkeling
St. Antonius Ziekenhuis Nieuwegein / Utrecht
T 030-2633648
M 06-22866618
------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=2722392
To unsubscribe from this discussion, e-mail: [[email protected]].