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

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

From: Peter Kahn <citizenkahn_at_gmail.com>
Date: Thu, 22 Jan 2009 12:39:54 -0800 (PST)

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.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-22 21:45:31 CET

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