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

Re: merge with nonversioned paths?

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-11-19 22:39:15 CET

John Barstow <John_Barstow@gfsg.co.nz> writes:
> Now, I know there are cute shell things I can do to automate this myself.
> What I'm asking is if this is reasonable functionality to add to the merge
> command. I don't mind passing a specific flag (like --force or
> --allow-nonversioned) to enable this behavior.

I think not. 'svn merge' is intended to take the changes between two
*repository* trees and merge those changes into your working copy,
whence you can then commit after (maybe) tweaking.

Merging automatically does schedule files for addition and deletion,
as you would expect. But your use case is very different, not really
something 'svn merge' was meant to address.

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 19 23:14:32 2002

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

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