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 16:54:32 PST
Message I would have thought so. Especially since all I did was a switch --
relocate to fix the problem. So, it sounds like a bug, but sort of an
edge case

On Jan 22, 3:49 pm, Bob Archer <Bob.Arc...@amsi.com> wrote:
> Hmm... interesting. Shouldn't it see that these are the same
> repositories based on the GUID and act accordingly?
>
> BOb
>
> > Bad Case DNS-IP
> > 1. Merging revisions 1-HEAD...
>
> > Good Case DNS-DNS
> > 1. Merging revisions 1-HEAD...
> > 2. Merging r701-923...
>
> --------------------​--------------------​--------------http://tortoisesvn.t​igris.org/ds/viewMes​sage.do?dsForumId=40​61&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr...@t​ortoisesvn.tigris.or​g].

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