Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: Merge doesn't agree with Eclipse or Command Line merge

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

tortoisesvn
Discussion topic

Back to topic list

Re: Merge doesn't agree with Eclipse or Command Line merge

Author citizenkahn
Full name Peter Kahn
Date 2009-01-22 12:39:55 PST
Message Thanks for the help.

It turns out that TSVN merged all revisions from 1-HEAD because I had
crossed the streams with my URLs.

I checked out the workspace using an IP address URL and was merging
using a DNS url.
-- svn co http://192.168..../branch
-- TSVN merge http://mysvnserver.../trunk to workspace

The mistakewas mine, but it might have been nice to have TSVN reject
my attempt or warn me.

In the DNS - to -IP case TSVN displayed one line of information prior
to the lines pertaining to individual files. In the DNS - to - DNS
case TSVN displayed two lines of information prior to the lines
pertaining to the individual files.

Bad Case DNS-IP
1. Merging revisions 1-HEAD...

Good Case DNS-DNS
1. Merging revisions 1-HEAD...
2. Merging r701-923...

The first was as you said, the internal part who all three tools
used. The second didn't happen in the cross url situation. My guess
is eclipse has the ip base URL used in the workspace repository
definition so it was IP-to-IP urls and I must have mistakenly used a
different workspace for my command line check.

So, it's user error, but a warning would be great.

« Previous message in topic | 5 of 8 | Next message in topic »

Messages

Show all messages in topic

Merge doesn't agree with Eclipse or Command Line merge citizenkahn Peter Kahn 2009-01-21 11:53:14 PST
     Re: Merge doesn't agree with Eclipse or Command Line merge simonlarge Simon Large 2009-01-21 14:36:52 PST
         Re: Merge doesn't agree with Eclipse or Command Line merge citizenkahn Peter Kahn 2009-01-22 06:39:07 PST
     Re: Merge doesn't agree with Eclipse or Command Line merge steveking Stefan K√ľng 2009-01-22 09:04:01 PST
         Re: Merge doesn't agree with Eclipse or Command Line merge citizenkahn Peter Kahn 2009-01-22 12:39:55 PST
             RE: Merge doesn't agree with Eclipse or Command Line merge "Bob Archer" <Bob dot Archer at amsi dot com> "Bob Archer" <Bob dot Archer at amsi dot com> 2009-01-22 12:49:22 PST
                 Re: Merge doesn't agree with Eclipse or Command Line merge citizenkahn Peter Kahn 2009-01-22 16:54:32 PST
                     Re: Merge doesn't agree with Eclipse or Command Line merge citizenkahn Peter Kahn 2009-01-23 12:54:12 PST
Messages per page: