TurtoiseSVN has capability to modify svn database directly, without a
server. you can share your repository folder so other poeple can access it,
of course using TSVN to. i've do this alot recently. for credential, TSVN
will use current loged on user as who modified the source, not user used to
access the folder.
btw, do you has the original source code, the one that not modified by you
or your friend? because it will be pain in the head if you don't have one.
for merging:
1. create a working copy using check out command from right click context
menu. choose your repository folder as path.
2. put your original source into that folder and do commit. it will do add
operation to the repository.
3. copy the your modified source, replacing the original. the icon overlay
will change to red, a sign that your working copy has been modified. do a
commit again. now the repository have source updated by you.
4. do an update to revision operation. update to revision before current
one. for example, if current rev is 3, than update it to rev 2. now your
working copy will again contain your original source.
5. copy your friend source to the working copy and do an update.
6. if you and your friend working on different file, than there will be
nothing to do, just commit and its done. but if you do have, than TSVN will
notify you that there is a conflict. search up the update log for
conflicted file, double click it and it will open TortoiseMerge, that will
help you resolve the conflict manualy.
hope it will help...
On Mar 13, 2012 12:59 AM, "Nic" <nicolas.christie_at_gmail.com> wrote:
> Hi, I'm new to everything SVN and am trying to setup a repository to keep
> track of my software developing. I'm actually an electronics engineer so
> all the server setup is confusing me a lot. Introductions made, here's what
> I have so far:
>
> I've installed TortoiseSVN on my computer and created a repository on an
> empty unused local disk partition. By create I mean I right-clicked on a
> folder and selected "Create Repository here"... nothing else =)
> I've installed Apache Server and finally got the service running ok on my
> computer (had problems with IIS and Skype with ports use).
>
> Right now I'm not sure how to proceed. I have some folders I'd like to
> keep track of, on another partition of my disk. A co-worker has another
> version of the code and we would like to have all our versions put together.
> I've looked at the Tortoise help files, youtube tutorials and stuff and I
> can't figure out how to set things up. I think at some point trying things
> I added a group of folders and now those folders always get imported, even
> if I delete the repository folder, and clear all saved data from the
> settings menu. How can I get back to a clean start? Every help file I read
> so far asumes a lot of knowledge on many things, which I don't have a clue
> about. Not that the assuming is wrong, given the apps context, but I don't
> now how to fill in the gaps without having to go get anohter degree!
>
> So, I have:
> - a blank repository on partition D:
> - Software projects on partition C:
> - Software versions on other peoples computers.
>
> How do I setup Apache to allow other users to commit to the repository on
> my computer? Is it possible to do so without going into command line weird
> stuff?
>
> If anyone knows of a full-idiot-proof tutorial or manual, I'd be most
> grateful for it. If not... perhaps we can start one right now! I'd be happy
> to help.
>
> Thanks in advance,
>
> Nic
>
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2934516
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-03-12 19:21:16 CET