Re: [ptp-user] Eclipse Egit vs. command line git

[Roland Schulz <roland@xxxxxxx>]

Hi,

yes that is features isn't implemented in JGit (basis of EGit):
https://bugs.eclipse.org/bugs/show_bug.cgi?id=372606

I really hope this is fixed soon. It is really annoying.

Roland

On Mon, Jun 10, 2013 at 6:05 PM, Christoph Pospiech
<Christoph.Pospiech@xxxxxxxxxx> wrote:
> I noted gap in functionality between Egit and command line git, which shows off
> when a file is both changed and renamed or moved. In this case, e.g. gitk shows
> a message like the following.
> ------------------------ lmpar/src/data_runcontrol.f90------------------------
> similarity index 88%
> rename from lmpar/src_cosmo/data_runcontrol.f90
> rename to lmpar/src/data_runcontrol.f90
> index 1743dba..6fd19e4 100644
> (followed by the contents of diff -u)
>
> Egit (or project->team->show in history) won't catch the rename (or move) and
> simply lists  lmpar/src_cosmo/data_runcontrol.f90 as deleted and
> lmpar/src/data_runcontrol.f90 as new file.
>
> While this may be regarded as tolerable, it becomes a nuisance when a commit
> like the above is cherry picked. In this case, command line git will merge the
> changes in lmpar/src_cosmo/data_runcontrol.f90 and then rename the file, while
> Egit might merge the changes, but then deletes the file (or flags the attempted
> delete as a merge conflict) and then creates a new - unmerged - file with the
> new name.
>
> Not sure whether this should be regarded as a bug. Should this be filed as a
> bug report regardless ? The obvious work around is "shut down Eclipse and do
> the git stuff via command line; fall back to emacs or vi if you have to resolve
> merge conflicts". This is not politically correct for a post in PTP-user, but
> at least it works seamlessly :-)
> --
>
> Mit freundlichen Grüßen / Kind regards
>
> Dr. Christoph Pospiech
> High Performance & Parallel Computing
> Phone: +49-351 86269826
> Mobile: +49-171-765 5871
> E-Mail: christoph.pospiech@xxxxxxxxxx
> -------------------------------------------------------------------------------------------------------------------------------------------
> IBM Deutschland GmbH / Vorsitzender des Aufsichtsrats: Martin Jetter
> Geschäftsführung: Martina Koederitz (Vorsitzende), Reinhard Reschke, Dieter
> Scholz, Gregor Pillen, Joachim Heel, Christian Noll
> Sitz der Gesellschaft: Ehningen / Registergericht: Amtsgericht Stuttgart, HRB
> 14562 / WEEE-Reg.-Nr. DE 99369940
>
> _______________________________________________
> ptp-user mailing list
> ptp-user@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/ptp-user
>
>
>
>



-- 
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309