Hi Geir,
Thanks... that's pretty much what I do do now - though slightly
semantically different.
I suppose my question should have been along the lines;
Is this appropriate?
Is there a better way?
Does my "current" method impact anything?
I.e. - since it wasn't merged, it will now surely look like I have
just re-edited all the files in my vendor branch as opposed to having
replaced them with code from the trunk.
And if the above assumption is correct - then is there a better way to
do what I need - that achieves the outcome I want AND better "tracks"
the steps followed to get to HEAD from (previous) Rxxxxx.
Gavin.
On 27/05/2009, at 11:59 PM, Engebakken Geir wrote:
> Just remove vendor1, then copy!
>
>
> Geir
>
> -----Original Message-----
> From: Gavin Baumanis [mailto:gavinb_at_thespidernet.com]
> Sent: 27. mai 2009 11:47
> To: users_at_subversion.tigris.org
> Subject: Overwriting files.
>
> This is going to be one of those "stupid" questions...
> Where I end up feeling like a bit of an idiot for having to ask....
> but far better to ask and feel foolish and get some appropriate
> instructions - than not to ask and simply be foolish!
>
> Anyway,
>
> I have the folloiwng paths in the repo already.
> trunk/
> branches/vendor1/
>
> What I need to do is completely overwrite vendor1 with the current
> state of the trunk.
>
> I thought that svn copy would be my friend..
> svn copy trunk/ branches/vendor1/
> but it won't work because the target already exists, and it doesn't
> have a --force option either.
>
> Previously I have used;
> svn export trunk/ branches/vendor1 --force
>
> and I have also simply copied the files with the OS and then later
> committed.
>
> And I have also used;
> svn merge -r1:head trunk/ branches/vendor1/ - but that just seems like
> a bit of overkill - particularly if the trunk has seen a lot of
> action!
>
> So I hand it over to you, to point me in the right direction, please!
>
>
> Thanks in advance,
> Gavin.
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2355698
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org
> ].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2356671
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-29 08:23:09 CEST