| Cannot merge [message #512556] |
Fri, 05 February 2010 08:38  |
Eclipse User |
|
|
|
I have 2 branches A and B.
I have a workspace that contains the checkouts from branch A, and
I try to merge from B to A by clicking "team"->"merge"->"URL" and entering the URL to one of the subfolder in the branch B and the revision #.
I am sure that under that revision #, I added tons of files to branch B, and so I can't believe that subversive keeps telling me, "Merge: no changes found".
Did I do anything stupid?
Thanks in advance.
|
|
|
|
|
| Re: Cannot merge [message #515912 is a reply to message #515222] |
Mon, 22 February 2010 03:41  |
| Eclipse User |
|
|
|
Hello,
It's difficult to say what the problem could be, please, try the following:
- try to make merge not on specific folder but on project root and see the
results. Note that you can always revert changes after merge so it's not
dangerous operation.
- please, see output in SVN Console view (I described in my previous comment
how to customize it) and verify whether there were real changes in those
revision range at interested folder
> Thanks for your reply, Igor.
>
> I have tried to use the URL pointing to the corresponding folder in branch
> B. But it still says "Merge: no changes found".
>
> Let me try to be a little bit specific:
>
> I checked out svn://localhost:12345/zodiac/branches/A as a project to
> workspace#1.
>
> I checked out svn://localhost:12345/zodiac/branches/B as a project to
> another workspace, say #2.
>
> Then, I highlighted a folder in the project in workspace #1, say
> "project/x/y/z" and hit "team->merge"->URL:
> svn://localhost:12345/zodiac/branches/B/x/y/z
>
> Then, I clicked "preview", but there is nothing (besides the header).
>
> Any idea?
>
> Thanks in advance.
|
|
|
|
| Re: Cannot merge [message #519550 is a reply to message #518836] |
Tue, 09 March 2010 04:58 |
| Eclipse User |
|
|
|
Hello Andrew,
Does it show changes if you specify revisions to merge explicitly by
specifying them in Revisions input field? Also you can see ouput of the
merge command in SVN Console View which shows what actual revisions were
used in merging.
>> I have 2 branches A and B.
>>
>> I have a workspace that contains the checkouts from branch A, and I try
>> to merge from B to A by clicking "team"->"merge"->"URL" and entering the
>> URL to one of the subfolder in the branch B and the revision #.
>>
>> I am sure that under that revision #, I added tons of files to branch B,
>> and so I can't believe that subversive keeps telling me, "Merge: no
>> changes found".
>>
>> Did I do anything stupid?
>>
>> Thanks in advance.
>
>
> This may or may not be the same issue I am seeing. I use the PDT version
> of Eclipse and the Subversive SVNKit 1.2.2 (SVN 1.5.5) r5428 connector.
> Merge tracking for merging up from trunk to my branch has recently stopped
> working for me since Eclipse auto-upgraded my plugin and version of PDT.
> (Can't remember what version number Subversive was before this update).
>
> If I try and merge up from trunk to my branch I now always get 'No
> changes' when I know full well there are changes in trunk.
>
> When I check out my branch from the command line svn client and try a
> merge up from trunk using the command-line and not Eclipse/Subversive I
> see the changes coming in.
>
> Something has gone amiss in Subversive over the last week for me - now
> using SVNKit 1.2.2 r5428.
>
> Any ideas?
>
|
|
|
Powered by
FUDForum. Page generated in 0.05540 seconds
Home