CVS Problem [Unresolved Conflict]
Claude TADONKI
I use CVS and I have some problems. I have a file whcih appears to have
"unresolved conflict" and I can't do anything on it. What I would have
wanted to do is to reconsider the file in the repository, means that
puuting it again in the repository from my local working directory as a
new file ( I expect CVS to not take into account any earlier managing
inormations about that file).
Thanks for your help,
Claude Tadonki
Stephen Leake
Conflicts appear in a file managed by CVS when two people edit the
same lines in a file, and one checks in. When the second person tries
to check in, CVS detects the conflict.
Your local file should have lines like :
<<<<<<<<<<<<<<
(one version)
>>>>>>>>>>>>>>>
<<<<<<<<<<<<<<<
(other version)
>>>>>>>>>>>>>>
Edit the file, pick which version you want for each conflict.
Then CVS will let you commit the changes.
Or, if you are totally lost, simply delete the local copy, and do CVS
update. Then you will lose your local changes, but be back in normal
business.
--
-- Stephe
Zenin
: [-- text/x-vcard, encoding 7bit, 16 lines, name: Claude.Tadonki.vcf --]
For starters, don't attach vcards to Usenet posts, ever, thanks.
: Hello, I use CVS and I have some problems. I have a file whcih appears to
The current file will have a number of conflict markers inside it,
which look like >>>>>>>, <<<<<<<, and ======. In short, they show
your version of a section and the repository's version of the same
section, leaving you to edit it all back to what you like and remove
the markers. After that, commit it.
Your original version, without the markers, should saved locally as
.#filename.##.##.##, which will be hidden if you're on Unix (use 'ls -a'
to list it).
--
-Zenin (ze...@rhps.org) From The Blue Camel we learn:
BSD: A psychoactive drug, popular in the 80s, probably developed at UC
Berkeley or thereabouts. Similar in many ways to the prescription-only
medication called "System V", but infinitely more useful. (Or, at least,
more fun.) The full chemical name is "Berkeley Standard Distribution".
Zenin
>snip<
: Or, if you are totally lost, simply delete the local copy, and do CVS
: update. Then you will lose your local changes, but be back in normal
: business.
BTW, your local changes are still kept in a .#filename version of
the file. So even if the above is required, all is not lost. :-)
...I just wish CVS would refuse to cvs add any .# files by
default. Windows users love to CTRL-A and "cvs add" full
directories of .# backup files...
Claude TADONKI
But the problem is that the file is no longer in the repository
(accidentally delete from the repository by a unix command). Now, cvs still
get pointer to the file but it not really exist. That's why there are
conflits.
Claude
Zenin
: [-- text/plain, encoding 7bit, 7 lines --]
:
: Thanks for you answers,
Zenin
: [-- text/x-vcard, encoding 7bit, 16 lines, name: Claude.Tadonki.vcf --]
Again, please turn off "vcard" or other attachments when posting to
Usenet newsgroups. This is strike #2. Strike #3 I stop trying to
help you and simply kill file you.
: Thanks for you answers, But the problem is that the file is no longer in
: the repository (accidentally delete from the repository by a unix
: command).
Don't do that. :-)
: Now, cvs still get pointer to the file but it not really exist. That's why
: there are conflits. Claude
cd /my/projects/directory
cvs checkout -d fix_module module
cp module/path/to/file/you/deleted fix_module/path/to/file/you/deleted
cvs add fix_module/path/to/file/you/deleted
cvs commit fix_module/path/to/file/you/deleted
And in the future don't manually walk around a cvs repository if you
don't A) Know what you're doing and B) Have a recent tape backup
handy.