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

Hide all messages in topic

All messages in topic

Re: Merge doesn't agree with Eclipse or Command Line merge

Author citizenkahn
Full name Peter Kahn
Date 2009-01-23 12:54:12 PST
Message I'll try to rep it from a clean setting over the weekend and submit it
as a bug if I can do so

On Jan 22, 7:54 pm, Peter Kahn <citizenk...@gmail.com> wrote:
> 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].
>
> --------------------​--------------------​--------------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].

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].

RE: Merge doesn't agree with Eclipse or Command Line merge

Author "Bob Archer" <Bob dot Archer at amsi dot com>
Full name "Bob Archer" <Bob dot Archer at amsi dot com>
Date 2009-01-22 12:49:22 PST
Message 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...

Re: Merge doesn't agree with Eclipse or Command Line merge

Author citizenkahn
Full name Peter Kahn
Date 2009-01-22 12:39:55 PST
Message Thanks for the help.

It turns out that TSVN merged all revisions from 1-HEAD because I had
crossed the streams with my URLs.

I checked out the workspace using an IP address URL and was merging
using a DNS url.
-- svn co http://192.168..../branch
-- TSVN merge http://mysvnserver.../trunk to workspace

The mistakewas mine, but it might have been nice to have TSVN reject
my attempt or warn me.

In the DNS - to -IP case TSVN displayed one line of information prior
to the lines pertaining to individual files. In the DNS - to - DNS
case TSVN displayed two lines of information prior to the lines
pertaining to the individual files.

Bad Case DNS-IP
1. Merging revisions 1-HEAD...

Good Case DNS-DNS
1. Merging revisions 1-HEAD...
2. Merging r701-923...

The first was as you said, the internal part who all three tools
used. The second didn't happen in the cross url situation. My guess
is eclipse has the ip base URL used in the workspace repository
definition so it was IP-to-IP urls and I must have mistakenly used a
different workspace for my command line check.

So, it's user error, but a warning would be great.

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

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

Re: Merge doesn't agree with Eclipse or Command Line merge

Author simonlarge
Full name Simon Large
Date 2009-01-21 14:36:52 PST
Message 2009/1/21 Peter Kahn <citizenkahn at gmail dot com>:
> 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.

But does it actually merge revisions already merged?

Do svn and subclipse actually report the 700:HEAD range?

Simon


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

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
Messages per page: