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 steveking
Full name Stefan Küng
Date 2009-01-22 09:04:01 PST
Message Peter Kahn wrote:
> 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.

TSVN reports 1-HEAD because that's the revision range passed to the
merge API for such merges. Internally, both the command line client and
Subclipse do the same (pass 1-HEAD) to the API.
The API then finds out that only 700-HEAD should be merged and does the
merge that way.

Stefan

--
       ___
  oo // \\ "De Chelonian Mobile"
 (_,\/ \_/ \ TortoiseSVN
   \ \_/_\_/> The coolest Interface to (Sub)Version Control
   /_/ \_\ http://tortoisesvn.net
Attachments

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