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 citizenkahn
Full name Peter Kahn
Date 2009-01-22 06:39:07 PST
Message > 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

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