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

Re: Proper File Movement/Setup Methodology

From: Andy Levy <andy.levy_at_gmail.com>
Date: Tue, 20 Apr 2010 16:14:51 -0400

On Tue, Apr 20, 2010 at 16:08, Nick Myers <nick986_at_gmail.com> wrote:
> We have setup a server dedicated to SVN.  I'm currently setting up
> trial runs of TortoiseSVN on "client" machines to see how people like/
> dislike this method of software development.

Just curious here - as opposed to what? Whether people like or dislike
VCSs, they're critical to good development practices. Whether you use
Subversion or not, you need *something*.

> When we receive code updates from an outside source, I need to apply
> this code to what we already have so we can further modify it.  The
> file/folder structure is the same.  On my local machine...what I did
> last time was right click and copy (not under SVN menu) from the
> outside source and pasted into the root folder of the SVN project.  It
> then overwrote all the files.  Any files that were unchanged retained
> the green check, but any new files needed to be added (no icon) and
> any modified files had a (!) in red.  I then go through the whole
> rendition of adding, committing, and updating (maybe not in that
> order).
>
> I know this isn't normal (based on what I've read), but is this an
> accepted/preferred method?  Hopefully my post made some sense.

You're describing Vendor Branches. Short version:
1) Keep a copy of the outside code in your repository
2) Copy it (within the repository) for your use
3) When you get an update from outside, update their code in your repository
4) Merge the changes into your customized copy

See http://svnbook.red-bean.com/nightly/en/svn.advanced.vendorbr.html

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-20 22:15:12 CEST

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