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

applying a merge on a non workingcopy

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: 2004-12-10 12:55:11 CET


I wonder why merge requires a workingcopy. Problem is, that I'm tracking a
vendor's sources, and before loading a new version into the repository, I'd
like to apply local modifications to those sources.

Maybe the way I want to work itself is flawed, I don't have a set opinion on
that yet. However, I don't like the way it is described in chapter 7 of The
Book: I don't have a copy of the external sources in any of my own projects,
so there is no URL I could use to tell 'svn merge' what changes to
incorporate when dropping a new vendor release.

The thing I need is to provide some libraries to my fellow developers here,
possibly with changes that have not (yet) been merged upstream. If there's an
easier way to track external sources and still preserve local changes I'm all
open ears.



To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Dec 10 12:56:57 2004

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.