[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 06:39:06 -0800 (PST)

> But does it actually merge revisions already merged?

In the tortoise case it attempts to merge 1-HEAD and I can see from
the changes to the workspace it is doing just that.

> Do svn and subclipse actually report the 700:HEAD range?

Both by the mergeinfo and the changes to the workspace I can tell that
svn and subclipse have merged only 700:HEAD

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-22 15:56:41 CET

This message: [ Message body ]
Next message: Bob Archer: "RE: Local copy incorrectly checks in to two different branches"
Previous message: Dave Lawrence: "Re: Local copy incorrectly checks in to two different branches"
In reply to: Simon Large: "Re: Merge doesn't agree with Eclipse or Command Line merge"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.