Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Subversive » Reintegrate says "No changes found"
Reintegrate says "No changes found" [message #502123] Sun, 06 December 2009 01:29 Go to next message
Chris Lercher is currently offline Chris Lercher
Messages: 14
Registered: December 2009
Junior Member
Hi,

I'm trying to reintegrate a branch back into trunk.

- Works fine on the command line (svn merge --reintegrate ...)

However, using "Team -> Merge -> Reintegrate" just says "Merge: No changes found".

Trying again works *sometimes*. But only if "Preferences -> Team -> SVN -> SVN Connector -> Use Merge view" is unchecked (this way it inserts diff markers in my files). Then next time, it doesn't work.

To try again, it's possible to revert the files, and perform the operation again. This works consistently from the command line, but very unreliably from within Subversive.

Does anyone else get the same effect?

Thanks
Chris

Eclipse 3.5.1 (actually Springsource Tool Suite)
Subversive SVN Team Provider (Incubation) 0.7.8.I20091023-1300 ("Latest Release")
Command line Subversion client 1.6.5 (same version on server)
Mac OS Snow Leopard
Re: Reintegrate says "No changes found" [message #502124 is a reply to message #502123] Sun, 06 December 2009 02:04 Go to previous messageGo to next message
Chris Lercher is currently offline Chris Lercher
Messages: 14
Registered: December 2009
Junior Member
Seems I just found out, what the unreliability factor is: In the Reintegrate dialog, if I edit the URL input field with the keyboard (just adding a dummy character and deleting it again), it works. If I use the preselected value, and just hit Ok, it doesn't work (In that case it just tries to reintegrate the trunk with itself, according to the SVN console).

In contrast to my initial assumption, the "Use Merge view" option doesn't seem to make a difference.

However, even if the Merge view is selected, it doesn't work as I'd expect: Usually, when performing a "Team->Synchronize", I don't get diff markers in my files (I can resolve conflicts via the compare editor). But with the Reintegrate action, I always get the diff markers.

[Updated on: Sun, 06 December 2009 02:05]

Report message to a moderator

Re: Reintegrate says "No changes found" [message #502204 is a reply to message #502124] Mon, 07 December 2009 03:46 Go to previous messageGo to next message
Igor Burilo is currently offline Igor Burilo
Messages: 435
Registered: July 2009
Senior Member
Hello Chris,

> if I edit the URL input field with the keyboard, it works. If I use the
> preselected value, and just hit Ok, it doesn't work (In that case it just
> tries to reintegrate the trunk with itself, according to the SVN console).
In Merge dialog URL field isn't preselected, i.e. it's empty when Merge
dialog is opened, but you can select value for it from combo box.
In order to clarify that I correctly understand you have following
situation:
You're in the trunk and you want to merge changes to it from branch. So you
call Merge action where in Reintegrate tab you select from combo box URL
which point to needed branch, but instead of merging with branch you got in
Console that you merged with trunk itself.
(P.S. In order to see output in Console before executing Merge action you
can press Preview button)

> However, even if the Merge view is selected, it doesn't work as I'd
> expect: Usually, when performing a "Team->Synchronize", I don't get diff
> markers in my files (I can resolve conflicts via the compare editor). But
> with the Reintegrate action, I always get the diff markers.
Synchronize action doesn't set any diff markers in files, it just returns
statuses. What's wrong with it?

What Subversive, Connectors versions do you use?
Re: Reintegrate says "No changes found" [message #502208 is a reply to message #502204] Mon, 07 December 2009 04:07 Go to previous messageGo to next message
Chris Lercher is currently offline Chris Lercher
Messages: 14
Registered: December 2009
Junior Member
Hello Igor,

Igor Burilo wrote on Mon, 07 December 2009 03:46

In Merge dialog URL field isn't preselected, i.e. it's empty when Merge
dialog is opened, but you can select value for it from combo box.


Actually, it's not empty. It's prefilled (with the correct value), because I've used the dialog before. But it appears, that this prefill is only _displayed_ in the text field, but not submitted. However, if I edit the text field in any way (e. g. by adding any character to the text field, and deleting that character again), it does submit the value.

Quote:

In order to clarify that I correctly understand you have following
situation:
You're in the trunk and you want to merge changes to it from branch.


Correct.

Quote:
So you
call Merge action where in Reintegrate tab you select from combo box URL
which point to needed branch, but instead of merging with branch you got in
Console that you merged with trunk itself.
(P.S. In order to see output in Console before executing Merge action you
can press Preview button)



Yes, the preview also shows no changes.

Quote:

What Subversive, Connectors versions do you use?


I tried both SVNKit 1.3 (which is the version that works with SVN 1.6) and JavaHL 1.6. I didn't see any difference.
Re: Reintegrate says "No changes found" [message #502209 is a reply to message #502204] Mon, 07 December 2009 04:14 Go to previous messageGo to next message
Chris Lercher is currently offline Chris Lercher
Messages: 14
Registered: December 2009
Junior Member
Igor Burilo wrote on Mon, 07 December 2009 03:46

Synchronize action doesn't set any diff markers in files, it just returns
statuses. What's wrong with it?


Exactly, the usual "Synchronize with Repository" doesn't set diff markers in my files. But the "reintegrate" merge action does, even when I select the Merge view option (and it probably shouldn't).
Re: Reintegrate says "No changes found" [message #502220 is a reply to message #502208] Mon, 07 December 2009 04:35 Go to previous messageGo to next message
Igor Burilo is currently offline Igor Burilo
Messages: 435
Registered: July 2009
Senior Member
Hello Chris,

You're right, URL field was prefilled previously, but starting from
0.7.8.I20091023-1300 version (which is a latest Subversive release), it's
not prefilled, for more details please see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=290717 So this problem isn't
actual now.

> Hello Igor,
>
> Igor Burilo wrote on Mon, 07 December 2009 03:46
>> In Merge dialog URL field isn't preselected, i.e. it's empty when Merge
>> dialog is opened, but you can select value for it from combo box.
>
>
> Actually, it's not empty. It's prefilled (with the correct value), because
> I've used the dialog before. But it appears, that this prefill is only
> _displayed_ in the text field, but not submitted. However, if I edit the
> text field in any way (e. g. by adding any character to the text field,
> and deleting that character again), it does submit the value.
>
> Quote:
>> In order to clarify that I correctly understand you have following
>> situation:
>> You're in the trunk and you want to merge changes to it from branch.
>
>
> Correct.
>
> Quote:
>> So you call Merge action where in Reintegrate tab you select from combo
>> box URL which point to needed branch, but instead of merging with branch
>> you got in Console that you merged with trunk itself.
>> (P.S. In order to see output in Console before executing Merge action you
>> can press Preview button)
>
>
> Yes, the preview also shows no changes.
>
> Quote:
>> What Subversive, Connectors versions do you use?
>
>
> I tried both SVNKit 1.3 (which is the version that works with SVN 1.6) and
> JavaHL 1.6. I didn't see any difference.
Re: Reintegrate says "No changes found" [message #502221 is a reply to message #502209] Mon, 07 December 2009 04:41 Go to previous messageGo to next message
Igor Burilo is currently offline Igor Burilo
Messages: 435
Registered: July 2009
Senior Member
Hello Chris,

> Exactly, the usual "Synchronize with Repository" doesn't set diff markers
> in my files. But the "reintegrate" merge action does, even when I select
> the Merge view option (and it probably shouldn't).

"Use SVN Merge view" options means the following: merge operation is
performed, but affected by it resources are shown in SVN Merge view (which
is implemented on base of Sync view); so it's correct that there can be diff
markers in files after it.
Re: Reintegrate says "No changes found" [message #502225 is a reply to message #502220] Mon, 07 December 2009 05:02 Go to previous messageGo to next message
Chris Lercher is currently offline Chris Lercher
Messages: 14
Registered: December 2009
Junior Member
Hi,

Igor Burilo wrote on Mon, 07 December 2009 04:35
Hello Chris,

You're right, URL field was prefilled previously, but starting from
0.7.8.I20091023-1300 version (which is a latest Subversive release), it's
not prefilled, for more details please see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=290717 So this problem isn't
actual now.



I'm using that exact same version. Oh, with "prefilled", I meant it's prefilled as soon as I select an entry in the combo box (not really on opening the dialog).

Quote:
"Use SVN Merge view" options means the following: merge operation is
performed, but affected by it resources are shown in SVN Merge view (which
is implemented on base of Sync view); so it's correct that there can be diff
markers in files after it.


I already suspected that a little bit... but I think that's not what most users want. Especially when reintegrating an entire branch, using the synchronize view to accept changes bit by bit seems to be an extremely important use case. I mean, it's impossible to run a debugger, when diff markers won't let me compile the code...
Re: Reintegrate says "No changes found" [message #502633 is a reply to message #502225] Wed, 09 December 2009 03:49 Go to previous messageGo to next message
Igor Burilo is currently offline Igor Burilo
Messages: 435
Registered: July 2009
Senior Member
Hello Chris,

>You're in the trunk and you want to merge changes to it from branch. So you
>call Merge action where in Reintegrate tab you select from combo box URL
>which point to needed branch, but instead of merging with branch you got in
>Console that you merged with trunk itself.

I tried it several times but it works for me. Could you please provide
detailed steps how to reproduce this problem, probably I miss some important
detail. What OS do you use?
Re: Reintegrate says "No changes found" [message #502649 is a reply to message #502633] Wed, 09 December 2009 04:44 Go to previous messageGo to next message
Chris Lercher is currently offline Chris Lercher
Messages: 14
Registered: December 2009
Junior Member
Hello Igor,

I'm using Mac OS (Cocoa).

I'll have to give you the description off the top of my head, because my repository is currently not available:

First we'll have to perform some steps just to fill the combo box for the next time we use it:

Use the Reintegrate dialog and enter the branch URL.

Perform the reintegrate action.

Let's assume, this worked (or not, it doesn't really matter). Now undo by going to the command line and type "svn revert . -R" (which is the recommended way to cleanly undo a reintegrate merge before it's committed, according to the svn-book).

[If you like, you can verify here, that a reintegrate on the command line works fine. Make sure to undo this again.]

Refresh the directory in Eclipse (hit F5).

Go to the reintegrate dialog again. Now select the previously entered value from the combo box. Use the mouse to do this (it may be different if selected by keyboard arrows!) Verify that the value is displayed in the text box. Hit OK.

=> It is as if the text field hadn't been filled at all. (It tries to use the trunk as the merge source and target).

I'd guess that the combo box has a key listener, instead of a change listener (?) It's also possible, that Mac (Cocoa) sends different events, or maybe sends them in a different order.

For more on my system specs, please see my first post.
Re: Reintegrate says "No changes found" [message #502829 is a reply to message #502649] Wed, 09 December 2009 15:38 Go to previous messageGo to next message
Jens Ohlsson is currently offline Jens Ohlsson
Messages: 8
Registered: July 2009
Junior Member
Hi.

I have the same problem. Selecting from combo history does not work. I´m
also on Mac OS (Cocoa).

And it´s not just on the reintegrate tab. It doesn´t work in the dialog
at all.

/Jens

Chris Lercher skrev 2009-12-09 10:44:
> Hello Igor,
>
> I'm using Mac OS (Cocoa).
>
> I'll have to give you the description off the top of my head, because my
> repository is currently not available:
>
> First we'll have to perform some steps just to fill the combo box for
> the next time we use it:
>
> Use the Reintegrate dialog and enter the branch URL.
>
> Perform the reintegrate action.
>
> Let's assume, this worked (or not, it doesn't really matter). Now undo
> by going to the command line and type "svn revert . -R" (which is the
> recommended way to cleanly undo a reintegrate merge before it's
> committed, according to the svn-book).
>
> [If you like, you can verify here, that a reintegrate on the command
> line works fine. Make sure to undo this again.]
>
> Refresh the directory in Eclipse (hit F5).
>
> Go to the reintegrate dialog again. Now select the previously entered
> value from the combo box. Use the mouse to do this (it may be different
> if selected by keyboard arrows!) Verify that the value is displayed in
> the text box. Hit OK.
>
> => It is as if the text field hadn't been filled at all. (It tries to
> use the trunk as the merge source and target).
>
> I'd guess that the combo box has a key listener, instead of a change
> listener (?) It's also possible, that Mac (Cocoa) sends different
> events, or maybe sends them in a different order.
>
> For more on my system specs, please see my first post.
Re: Reintegrate says "No changes found" [message #503450 is a reply to message #502649] Sun, 13 December 2009 23:36 Go to previous messageGo to next message
Igor Burilo is currently offline Igor Burilo
Messages: 435
Registered: July 2009
Senior Member
Hello Chris,

I have some suggestions why it doesn't work, but I need to verify it at
first before providing the fix. Could you please check the following:
1. open CVS Repositories view (you can find it in CVS Repository
perspective) and select New/Repository Location then you'll see 'Add CVS
Repository' dialog which have similar to Subversive combo boxes
2. fill any value in 'User' field
3. fill any value in 'Repository Path' field
4. fill 'Host' field by selecting its value from combo box, where it has to
contain previously used values (if it doesn't contain previous values,
create any fake repository location at first). It's important to select its
value from combo box but not entering any text there.
5. As a result Finish button should become enabled.

What we check here: we check that Finish button has to become enabled by
reacting to selecting value from combo box; it's similar to Subversive but
in Subversive by selecting value in combo box, URL should get new value.


> Hello Igor,
>
> I'm using Mac OS (Cocoa).
>
> I'll have to give you the description off the top of my head, because my
> repository is currently not available:
>
> First we'll have to perform some steps just to fill the combo box for the
> next time we use it:
>
> Use the Reintegrate dialog and enter the branch URL.
>
> Perform the reintegrate action.
>
> Let's assume, this worked (or not, it doesn't really matter). Now undo by
> going to the command line and type "svn revert . -R" (which is the
> recommended way to cleanly undo a reintegrate merge before it's committed,
> according to the svn-book).
>
> [If you like, you can verify here, that a reintegrate on the command line
> works fine. Make sure to undo this again.]
>
> Refresh the directory in Eclipse (hit F5).
>
> Go to the reintegrate dialog again. Now select the previously entered
> value from the combo box. Use the mouse to do this (it may be different if
> selected by keyboard arrows!) Verify that the value is displayed in the
> text box. Hit OK.
>
> => It is as if the text field hadn't been filled at all. (It tries to use
> the trunk as the merge source and target).
>
> I'd guess that the combo box has a key listener, instead of a change
> listener (?) It's also possible, that Mac (Cocoa) sends different events,
> or maybe sends them in a different order.
>
> For more on my system specs, please see my first post.
Re: Reintegrate says "No changes found" [message #503453 is a reply to message #503450] Mon, 14 December 2009 04:53 Go to previous messageGo to next message
Chris Lercher is currently offline Chris Lercher
Messages: 14
Registered: December 2009
Junior Member
Igor Burilo wrote on Sun, 13 December 2009 23:36

What we check here: we check that Finish button has to become enabled by
reacting to selecting value from combo box; it's similar to Subversive but
in Subversive by selecting value in combo box, URL should get new value.



Hello Igor,

I performed the steps according to your description.

The Finish button gets enabled as soon as I click on the value in the combo box.
Re: Reintegrate says "No changes found" [message #503468 is a reply to message #503453] Mon, 14 December 2009 01:18 Go to previous messageGo to next message
Igor Burilo is currently offline Igor Burilo
Messages: 435
Registered: July 2009
Senior Member
Hello Chris,

I created a corresonding bug:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=297720
Note that you can add yourself to bug CC in order to track its activity.
Thanks.

> Hello Igor,
>
> I performed the steps according to your description.
>
> The Finish button gets enabled as soon as I click on the value in the
> combo box.
>
Re: Reintegrate says "No changes found" [message #504120 is a reply to message #502123] Thu, 17 December 2009 06:17 Go to previous message
Chris Lercher is currently offline Chris Lercher
Messages: 14
Registered: December 2009
Junior Member
Great! And thanks for fixing this so quickly!
Previous Topic:Asterisk and boldface in history view
Next Topic:User Credential - Popup
Goto Forum:
  


Current Time: Thu Jul 31 17:38:23 EDT 2014

Powered by FUDForum. Page generated in 0.02447 seconds