Login | Register
My pages Projects Community openCollabNet

Discussions > users > RE: Local copy incorrectly checks in to two different branches

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Hide all messages in topic

All messages in topic

Re: Local copy incorrectly checks in to two different branches

Author Kurt Pruenner <leak at gmx dot at>
Full name Kurt Pruenner <leak at gmx dot at>
Date 2009-01-28 01:25:17 PST
Message Charles Worm wrote:
> 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.

I would suggest using WinMerge[1] for that job - you can use it to
compare your old and new working copy folder structure and then
selectively copy the files you want across, or even merge just parts of
differing files by hand.


[1] http://www.winmerge.org/
    (or http://sourceforge.n​et/projects/winmerge​ since I currently have
     a hard time connecting to their web site...)

--
Kurt Bernhard Pruenner --- Haendelstrasse 17 --- 4020 Linz --- Austria
.......It might be written "Mindfuck", but it's spelt "L-A-I-N".......

Re: Local copy incorrectly checks in to two different branches

Author Charles Worm <charles dot worm at gmail dot com>
Full name Charles Worm <charles dot worm at gmail dot com>
Date 2009-01-27 22:22:20 PST
Message On Jan 26, 7:46 am, Charles Worm <charles.w...@gmail.com> wrote:
> On Jan 24, 1:35 am, Dave Lawrence <dlawre...@ad-hol​dings.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.

Re: Local copy incorrectly checks in to two different branches

Author Charles Worm <charles dot worm at gmail dot com>
Full name Charles Worm <charles dot worm at gmail dot com>
Date 2009-01-25 13:46:44 PST
Message On Jan 24, 1:35 am, Dave Lawrence <dlawre...@ad-hol​dings.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.

But nobody commented on my other suggestion:
"Is it safe to export the old copy, then copy the exported files over
the new
copy and then commit?"

If this isn't a good idea I would like to understand why.

Re: Local copy incorrectly checks in to two different branches

Author Dave Lawrence <dlawrence at ad-holdings dot co dot uk>
Full name Dave Lawrence <dlawrence at ad-holdings dot co dot uk>
Date 2009-01-23 07:35:38 PST
Message Bob Archer wrote:
>> or you could use svn merge?
>
> He can't merge and that doesn't even apply. If you read his original
> message his WC is messed up. Different parts of it pointing to the wrong
> places and such. This is also why a patch probably won't work.
>

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)

Yes a new working copy is probably required in this case (checked out
from the "right repo")

RE: Local copy incorrectly checks in to two different branches

Author "Bob Archer" <Bob dot Archer at amsi dot com>
Full name "Bob Archer" <Bob dot Archer at amsi dot com>
Date 2009-01-23 07:27:31 PST
Message >
> or you could use svn merge?

He can't merge and that doesn't even apply. If you read his original
message his WC is messed up. Different parts of it pointing to the wrong
places and such. This is also why a patch probably won't work.

BOb

Re: Local copy incorrectly checks in to two different branches

Author Dave Lawrence <dlawrence at ad-holdings dot co dot uk>
Full name Dave Lawrence <dlawrence at ad-holdings dot co dot uk>
Date 2009-01-23 06:57:40 PST
Message Bob Archer wrote:
> 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.
>

or you could use svn merge?

>
>
> BOb
>
>
>
>
>
> --------------------​--------------------​--------------------​------------
>
> *From:* Charles Worm
> [mailto:charles dot worm at gmail dot com]
> *Sent:* Thursday, January 22, 2009 8:21 PM
> *To:* users at tortoisesvn dot tigris dot 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...@ad-holdings.co.uk
> <mailto:dlawre...​@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?
>
>
>
>
>

RE: Local copy incorrectly checks in to two different branches

Author "Bob Archer" <Bob dot Archer at amsi dot com>
Full name "Bob Archer" <Bob dot Archer at amsi dot com>
Date 2009-01-23 06:51:13 PST
Message 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 dot worm at gmail dot com]
Sent: Thursday, January 22, 2009 8:21 PM
To: users at tortoisesvn dot tigris dot 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...@ad-hol​dings.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?
Attachments

Re: Local copy incorrectly checks in to two different branches

Author jeanmarc
Full name Jean-Marc van Leerdam
Date 2009-01-23 01:20:21 PST
Message Charles,

Can't help you on your problem, but all your mails got through :) Are you
subscribed to the mailiing list? If not, then your posts need to be
moderated before they are sent to the list, which can take some time as the
moderators are not online 24x7.

Regards,

Jean-Marc.

2009/1/23 Charles Worm <charles dot worm at gmail dot com>

> 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
>

--
Regards,

Jean-Marc
--
      ___
 @@ // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
  \ \_/_\_/> The coolest Interface to (Sub)Version Control
  /_/ \_\ http://tortoisesvn.net
Attachments

Local copy incorrectly checks in to two different branches

Author Charles Worm <charles dot worm at gmail dot com>
Full name Charles Worm <charles dot worm at gmail dot com>
Date 2009-01-22 17:21:10 PST
Message 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...@ad-hol​dings.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?
Attachments
Messages per page: