Issue 4685 in pharo: merge dialog conflict: remove changed method

Status: New
Owner: ----

New issue 4685 by [hidden email]: merge dialog conflict: remove  
changed method
http://code.google.com/p/pharo/issues/detail?id=4685

In the merge dialog, you can not resolve the following conflict:
<local: removed; remote: changed>  -> keep local.

You can only keep the remote change, so you have to remember the method  
name and after the merge go and remove it.


Pharo image: Pharo
Pharo core version: Pharo1.2.2
Virtual machine used: Mac Squeak 4.2.2beta1U
Class browser used: OBSystemBrowserAdaptor

Steps to reproduce:
1. Make a change in a method and commit it
2. Load the earlier code and remove that method
3. Merge with the other commit and try to keep the method removed


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker

Updates:
        Status: Accepted

Comment #1 on issue 4685 by [hidden email]: merge dialog conflict:  
remove changed method
http://code.google.com/p/pharo/issues/detail?id=4685

Is it a bug or a feature request?
Was is working in 1.1?
Did you check in 1.4?


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker

Comment #2 on issue 4685 by [hidden email]: merge dialog conflict:  
remove changed method
http://code.google.com/p/pharo/issues/detail?id=4685

I did not check it, but I guess it is a missing feature


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker

Updates:
        Status: Closed

Comment #3 on issue 4685 by [hidden email]: merge dialog conflict:  
remove changed method
http://code.google.com/p/pharo/issues/detail?id=4685

With Pharo 2.0 now beta, time has come to review bug reports that have not  
seen any activity in 2012.
To keep the amount of issues managable, we close reports that have not  
drawn any attention for over one
year.

The reporter (and thus owner) of the issue should:

  -> check the issue in 2.0. Is it still relevant?
  -> If yes, just add a note to the report and we will be opened again.


As your issue has not seen any attention for over a year, please consider  
to give more information.
A good idea can be to send a mail to the mailinglist to get other people to  
help fixing the bug or
implementing an improvement.



_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker