[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: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 23 Jan 2009 09:50:53 -0500

All your message have come through. Sometimes it takes a few minutes
before newly entered messages show up in the google groups online
viewer. Just be patient. Your messages are getting through.

 

Now, I would go back to my original suggestion.

 

1. Rename your current working copy (WC).
2. Do a new checkout.
3. Copy changed from old WC to new one. You can use beyond compare
or similar tool to do this. Make sure not to copy any .svn folders or
contents.
4. Done.

 

BOb

 

 

________________________________

From: Charles Worm [mailto:charles.worm_at_gmail.com]
Sent: Thursday, January 22, 2009 8:21 PM
To: users_at_tortoisesvn.tigris.org
Subject: Local copy incorrectly checks in to two different branches

 

Pulling my hair out here. Google Groups doesn't seem to be working
properly. Posting says it works but it's not, nor or my last visit time
updating so everything has become static.

 

Anyway, this is an attempt to reply for the 6th time to the topic I
started, but this time via e-mail instead of Google Groups

 

On Jan 23, 4:08 am, Dave Lawrence <dlawre..._at_ad-holdings.co.uk> wrote:

> Bob Archer wrote:

> >> You could use a patch to do that. Create a patch from your current

> >> copy, apply it to the new copy.

>

> > That's a lot of work, isn't it? Just get a clean checkout then copy
your

> > modified files from the bad checkout to the new one.

>

> Is it?

> 1) TortoiseSVN->Create patch (from old copy)

> 2) Click "copy to clipboard"

> 3) TortoiseSVN->Apply patch (to new copy)

> 4) Click "load from clip board"

> 5) Click "patch all"

 

Unfortunately patching won't work as my copy was successfully committed,
it's just that half my changes went to the wrong branch.

 

Is it safe to export the old copy, then copy the exported files over the
new copy and then commit?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-23 15:51:20 CET

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