Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » Rename merge does not work - is there any workaround?(The lack of this feature makes any serious refactoring cumbersome.)
Rename merge does not work - is there any workaround? [message #964820] Tue, 30 October 2012 20:31 Go to next message
Marton Sigmond is currently offline Marton SigmondFriend
Messages: 71
Registered: July 2009
Location: Hungary
Member
Hi,

Try the following steps, do everything in the IDE:
1) Create a Java project, a Java interface in it, and a method in that interface.
2) Create a Git project around it, and commit an initial revision.
3) Add a new method to the beginning of the interface (before the original method), and commit the change.
4) Create a new branch from the initial revision, and checkout that branch.
5) Rename the interface (or move it to another package), and commit the change.
6) Add a new method to the end of the interface (after the original method), and commit the change.
7) Finally try to merge the new branch with the master.

What you will get is an ugly conflict.
However, if you followed the above steps closely, you can see that it should be a non-conflicting merge.

Also, if I perform the last step in the command line, the merge will happen seamlessly.

This is quite unfortunate as it makes refactoring cumbersome.

Is there any workaround for this problem?
Has anyone filed a bug for this yet?

Cheers,
Marton
Re: Rename merge does not work - is there any workaround? [message #965005 is a reply to message #964820] Wed, 31 October 2012 00:01 Go to previous messageGo to next message
Chris Aniszczyk is currently offline Chris AniszczykFriend
Messages: 674
Registered: July 2009
Senior Member
This is currently being implemented, follow these:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=380314
https://git.eclipse.org/r/#/c/8113/
Re: Rename merge does not work - is there any workaround? [message #965371 is a reply to message #965005] Wed, 31 October 2012 07:17 Go to previous messageGo to next message
Marton Sigmond is currently offline Marton SigmondFriend
Messages: 71
Registered: July 2009
Location: Hungary
Member
Thanks!

Best Regards,
Marton Sigmond
Software Design Engineer
Re: Rename merge does not work - is there any workaround? [message #1006431 is a reply to message #964820] Thu, 31 January 2013 10:51 Go to previous messageGo to next message
Jan Hoskens is currently offline Jan HoskensFriend
Messages: 5
Registered: January 2013
Junior Member
This thread was started two months ago, the linked bug report also shows no real change for two months. Isn't this a critical one? Is there no progress on this?

We're switching to Git, but the rename merge problem is a real show stopper for the EGit plugin. How can anyone work with this plugin on a serious project while this bug isn't patched? We're now considering dumping EGit for SmartGit as the bug went silent two months ago.

Regards,
Jan
Re: Rename merge does not work - is there any workaround? [message #1065846 is a reply to message #1006431] Thu, 27 June 2013 18:42 Go to previous messageGo to next message
Marton Sigmond is currently offline Marton SigmondFriend
Messages: 71
Registered: July 2009
Location: Hungary
Member
Hi,

the status of the above bug is now fixed resolved.
I just downloaded and tried the above mentioned scenario in Eclipse Kepler (JGit 3.0.0.201306101825-r), and I still experience the same problem.

Is this a different issue then?

Regards,
Marton


Best Regards,
Marton Sigmond
Software Design Engineer
Re: Rename merge does not work - is there any workaround? [message #1065855 is a reply to message #1065846] Thu, 27 June 2013 20:41 Go to previous message
Robin Rosenberg is currently offline Robin RosenbergFriend
Messages: 332
Registered: July 2009
Senior Member
Marton Sigmond skrev 2013-06-27 20.42:
> Hi,
>
> the status of the above bug is now fixed resolved.
> I just downloaded and tried the above mentioned scenario in Eclipse Kepler (JGit 3.0.0.201306101825-r), and I still experience the same problem.
>
> Is this a different issue then?

Yes, recursive merge and rename are different things. This is the bug

https://bugs.eclipse.org/bugs/show_bug.cgi?id=388738
Previous Topic:Remote vs local repositories
Next Topic:Jgit commit peformance
Goto Forum:
  


Current Time: Mon Nov 24 21:52:49 GMT 2014

Powered by FUDForum. Page generated in 0.02109 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software