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

Re: Local copy incorrectly checks in to two different branches

From: Charles Worm <charles.worm_at_gmail.com>
Date: Tue, 27 Jan 2009 22:22:20 -0800 (PST)

On Jan 26, 7:46 am, Charles Worm <charles.w..._at_gmail.com> wrote:
> On Jan 24, 1:35 am, Dave Lawrence <dlawre..._at_ad-holdings.co.uk> wrote:
>
> > But with regards to the specific part of the question of how to get
> > changes that were committed into the "wrong repo" into the "right repo",
> > merge is exactly what you want.  Since it gets changes that have already
> > been committed to one URL (same repo or not) and applies them to a w/c
> > on another URL)
>
> I'll try merge when I get to work tomorrow.  I haven't used it before
> so I'll need to read up on how it works.

Ok, so I don't think merge is an option either. This is because only
my working copy is correct. Merging requires my changes to already be
sucessfully committed to SVN. I can't commit to SVN because the SVN
paths for my working copy are all messed up.

So I still need a way to get my changes from an old working copy
(where the SVN paths are wrong) to a new working copy, without
involving the repository. Once I get them to the new working copy I
can commit them and it'll be good.

Nobody has commented if my idea to export the older work copy and copy
the exported files across to the new working copy is a good idea or
not. It would be a load off my mind if someone said if this would
work or not. Then I can start focusing on another way to solve this
problem.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1061914

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-28 07:23:03 CET

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