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

Merge doesn't agree with Eclipse or Command Line merge

From: Peter Kahn <citizenkahn_at_gmail.com>
Date: Wed, 21 Jan 2009 11:53:13 -0800 (PST)

When merging with Tortoise all revisions appear to be merged ignoring
the mergeinfo property. Both eclipse and command line seem to do what
I expect.

I must be doing something wrong, but I don't know what

I have a branch and a trunk. Prior to branch creation we had 500
revisions on trunk. After branch creation we addfed 200 revisions on
trunk. We merged the additional 200 using command line and branch's
mergeinfo records 500:700 as merged.

We recently had 5 additional revisions to trunk.

** Only the 5 new revisions are merged when merging with command line
and eclipse
commandline -- svn merge url-trunk workspace-branch
eclipse -- Team->Merge, Merge a range of revisions,
provide no range in dialog

** All revisions are merged when mering with tortoise
Merge -> Merge a range or revisions, provide no range on dialog
From Tortoise Output: "Command: Merging revisions 1-HEAD of ...trunk
into ...workspace, respecting ancestry, Test Only "

Shouldn't that say 700-HEAD?

Am I missing an option or a pref somewhere, because I thought that
TortoiseSVN would only attempt to merge those revisions not yet

 Thanks for the help...

Peter Kahn
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-21 20:56:09 CET

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