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

Re: managing changes from developer that sends entire "release"

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-08-03 20:23:52 CEST

On 8/3/07, Brian Jarrett <jarrettlists@gmail.com> wrote:
> Hello list.
> I have a situation where I want to manage/merge a bunch of changes made by a
> contributing developer that is not using our subversion server. When he
> creates a "release" he's got all the files zipped in an archive and sends it
> out. This zip file contains the entire directory structure for a website.
> I want to take what he's sent me and put it into subversion so I can track
> what changes.
> Right now I've got a 2.x branch that is supposed to contain the lastest work
> on the website. I've also got a 2.11 branch that I used to add all the
> files he gave me, whether they've changed or not. I tried doing a merge of
> the 2.11 into the 2.x, but every file shows up as replaced, added or
> deleted. Most show up as replaced.
> I really want to be able to just commit the files that have been:
> Changed
> Moved from one directory to another
> Added (newly created)
> Deleted (removed in latest release)
> Any clues on how I can go about merging/committing changes with an entire
> directory structure as reference?

You may want to treat his releases like a Vendor Branch and use

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 3 20:22:26 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.