Re: Mail with code problem

Rui Dias wrote:
> Imagine I’m working overseas and can´t have access to repository.
> Everyday I send my changes to a colleague, he commits his code, then
> puts my changes in his code and set’s my code to commit. After this he
> sends me all code.

You can send/receive email, but you can't touch the repository?
Curious... (I'm assuming you're not fedex'ing code every day.)

A few things:

1) Have you tried an apache hosted repository? (I hope you have web access.)

2) Do you have ssh access? (svn+ssh works for me!)

3) Most importantly, are you running a local repository on your box? I
would think that you ought to be, so that you can do periodic checkin's
of your work throughout the day. You can still diff against the "all
code" dumps you're getting from your colleague and just merge those as a
single commit. (File/directory moves/adds/changes may cause some
headaches.) Read up on svk, it sounds like what you really need.

> When I get to enterprise All my code get’s conflicted. Is there a way to
> say to repository that I’ve got allready the last version?

Aside from my above comments, I'd say move your directory out of the
way, checkout fresh, then diff/patch/merge your most recent changes into
the working copy.

-- 
Andrew Thompson
http://aktzero.com/
Interested in a hosted SVN repository? Email me, let's talk...
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org