[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Updating the repository from wildcat user update

From: Steve Swift <steve.j.swift_at_gmail.com>
Date: Tue, 29 May 2012 04:21:14 -0700 (PDT)

We're just at the point of migrating to SVN, but we had a problem at the weekend which required the duty person to apply an emergency fix. He had his own copy (not a working copy) of the code, so he updated three files, compiled it, and fixed the problem.

This left me with the issue of integrating his updates back into the repository.

I compared his files with my working copy, and there were only three files that differed. So far, so good. I copied his files into my working copy, and committed the update. Back on a level keel.

Is there a more elegant way to have handled this?

At the very least, it would have been nice had the update appeared to have come from my colleague's ID and not mine.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2967543

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-05-29 13:21:21 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.