> I then imported all the code in the new Eclipse project
Importing doesn't change your working copy's svn path so your working copy was still on the previous path. So your changes were made on the original project.
You should have performed an "import" then a "checkout" to create a new working copy.
Julien.
-----Message d'origine-----
De : Lyallex [mailto:lyallex_at_gmail.com]
Envoyé : jeudi 17 juillet 2008 16:48
À : users_at_tortoisesvn.tigris.org
Objet : Re: Stupid, stupid, stupid mistake
...
>
>> Somehow I managed to get this into version control under a new project
>> directory.
>
> I'm not sure what you mean here. Did you actually create anything new in the
> repository or are these still local changes?
>
Thank you for taking the time to reply
I'm not sure what I mean either. OK, I created a new folder in the repo root
In there I created tags, branches, trunk I then imported all the code
in the new Eclipse project
into trunk, then I started working on the new project, at the same
time another developer continued
with the old project. When I started to want to commit changes I was
getting conflicts with code in the old project in the repo
Does this make sense ?
Does anything ?
Should I apply for a job lobbing pies ?
I'll try some of your suggestions in the meantime
sheepish
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
This message and any attachments (the "message") is
intended solely for the addressees and is confidential.
If you receive this message in error, please delete it and
immediately notify the sender. Any use not in accord with
its purpose, any dissemination or disclosure, either whole
or partial, is prohibited except formal approval. The internet
can not guarantee the integrity of this message.
BNP PARIBAS (and its subsidiaries) shall (will) not
therefore be liable for the message if modified.
Do not print this message unless it is necessary,
consider the environment.
---------------------------------------------
Ce message et toutes les pieces jointes (ci-apres le
"message") sont etablis a l'intention exclusive de ses
destinataires et sont confidentiels. Si vous recevez ce
message par erreur, merci de le detruire et d'en avertir
immediatement l'expediteur. Toute utilisation de ce
message non conforme a sa destination, toute diffusion
ou toute publication, totale ou partielle, est interdite, sauf
autorisation expresse. L'internet ne permettant pas
d'assurer l'integrite de ce message, BNP PARIBAS (et ses
filiales) decline(nt) toute responsabilite au titre de ce
message, dans l'hypothese ou il aurait ete modifie.
N'imprimez ce message que si necessaire,
pensez a l'environnement.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-17 17:13:28 CEST