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

Hello, and a branch/merge question

From: Pawel Rozanski <tokugawa_at_afn.no-ip.org>
Date: 2004-01-13 03:53:15 CET


First of all, thanks for great program. I have moved all my bigger
projects to SVN (on my local machine), and I just think "What?, I worked
without it?". :)

Since I'm the only user for now I have 'layout question'

-- Suppose I have something like that (in repo) --


-- and i copied it like ---

Project/trunk/sub (from sub/trunk)

-- (I need sub as subdirectory of Project) ---

And now, I will use only Project/trunk/* ...
so... if later I will merge changes from
Project/trunk/sub to sub/trunk i will lost
the data from which dir this was merged.
(since this is local diff, and simple commit)

But can I just overwrite (this is enough for me)
that files ? (by server side copy Project/trunk/sub ->
sub/trunk) ?

Any sugestions will help ....(maybe other way to do such thing)

Pawel Rozanski

P.S. Does tag created by 'Creating a Complex Tag' by 'svn update -r'
will have that info (that file was from that dir/revision, another one
have from other one) ?

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 13 03:51:49 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.