Login | Register
My pages Projects Community openCollabNet

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

Merge doesn't agree with Eclipse or Command Line merge

Author citizenkahn
Full name Peter Kahn
Date 2009-01-21 11:53:14 PST
Message 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

Details:
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
propagated.

 Thanks for the help...

--
Peter Kahn
citizenkahn at gmail dot com

« Previous message in topic | 1 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: