[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Can one user develop concurent versions ?
From: |
Adrian Constantin |
Subject: |
Re: Can one user develop concurent versions ? |
Date: |
Thu, 17 Jun 2004 06:36:51 -0700 (PDT) |
Thank you everyone. Glad to hear it is all ok.
--- Spiro Trikaliotis <address@hidden> wrote:
> Hello Adrian,
>
> * On Thu, Jun 17, 2004 at 05:16:23AM -0700 Adrian
> Constantin wrote:
> So I
> > have three checked out copies of the project,
> using the same user.
>
> I do this myself very often.
>
>
> > I wonder if sometimes I get out of sync with my
> copies so that I have
> > concurent versions of the project, all under my
> username, will cvs
> > recognize the situation ?
>
> Do you ask beforehand, or do you have any problems?
> I have not yet to
> encounter any problems with this setup, cvs works
> good.
>
> In fact, it does not seem to be interested in the
> user account at all.
>
I think my problem is not related to user accounts
and cvs.
After some incorrect ftp transfer I've imported
files
with lines separated by CR instead of LF. I suspect
CVS really sees the file as one line. When I update
an updated file it says Conflict and gives back to
me
both the old and new files entirely, not only
modified lines (which are only a few)
Any ideeas how to correct a file in repository with
CR separated lines ?
Constantin Adrian
----------------------------------------
And I don't wanna miss a thing
__________________________________
Do you Yahoo!?
Take Yahoo! Mail with you! Get it on your mobile phone.
http://mobile.yahoo.com/maildemo