lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "david.w.smiley@gmail.com" <david.w.smi...@gmail.com>
Subject Re: intellij git history
Date Sun, 24 Jan 2016 16:32:03 GMT
THANKS!
On Sun, Jan 24, 2016 at 11:26 AM Dawid Weiss <dawid.weiss@gmail.com> wrote:

> I will do it.
>
> D.
>
> On Sun, Jan 24, 2016 at 3:06 PM, Uwe Schindler <uwe@thetaphi.de> wrote:
> > Hi,
> >
> > I tried it out locally: It is quite easy to use "rebase" and step over
> those 2 commits. So you can just remove them, because they are together
> basically a no-op (remove all and then add all back).
> >
> > I can do that for both branches and then do a "git push --force" of the
> rewritten history? Any comments?
> >
> > Uwe
> >
> > -----
> > Uwe Schindler
> > H.-H.-Meier-Allee 63, D-28213 Bremen
> > http://www.thetaphi.de
> > eMail: uwe@thetaphi.de
> >
> >
> >> -----Original Message-----
> >> From: Dawid Weiss [mailto:dawid.weiss@gmail.com]
> >> Sent: Sunday, January 24, 2016 9:59 AM
> >> To: dev@lucene.apache.org
> >> Subject: Re: intellij git history
> >>
> >> We can move the reference for master and branch_5x -- these are
> >> affected. I can do it tonight and cherry pick any commits that have
> >> been added since then.
> >>
> >> Dawid
> >>
> >> On Sun, Jan 24, 2016 at 7:07 AM, david.w.smiley@gmail.com
> >> <david.w.smiley@gmail.com> wrote:
> >> > I'm seeing this too Yonik :-(  This really sucks.  I googled and
> found this:
> >> >
> >> > http://stackoverflow.com/questions/27797965/showing-graphically-the-
> >> equivalent-of-git-log-follow-in-intellij
> >> > Which makes reference to 2 IntelliJ issue tracker bug reports, both
> marked
> >> > as closed years ago.  In summary, Jetbrains says IntelliJ has its own
> rename
> >> > detection algorithm and deliberately doesn't use "--follow" because it
> >> > alleges it to be buggy.
> >> >
> >> > What to do?  I'm sure it's controversial to suggest this but... why
> did we
> >> > need this delete all & re-add commits in the first place?  I'm +1 to
> a force
> >> > push to omit them; it will never be easier to do this than now (just 4
> >> > branches).  FWIW IntelliJ's algorithm *does* follow
> SearchComponent.java
> >> > from just prior to this to its inception in 2007 -- my go-to test this
> >> > feature works.  I tested this by adding a branch based on a hash from
> just
> >> > prior to these commits and then viewing the history of this file (all
> via
> >> > IntelliJ).
> >> >
> >> > ~ David
> >> >
> >> > On Sat, Jan 23, 2016 at 10:27 PM Mark Miller <markrmiller@gmail.com>
> >> wrote:
> >> >>
> >> >> Just a guess, but perhaps the follow option will help?
> >> >> On Sat, Jan 23, 2016 at 9:56 PM Yonik Seeley <yseeley@gmail.com>
> wrote:
> >> >>>
> >> >>> Everything looks fine from the command line, but Intellij  IDEA
14
> >> >>> doesn't seem to be able to see the history:
> >> >>>
> >> >>> If I right click on a file and do "GIT->Show History" I only
see a
> single
> >> >>> entry:
> >> >>>
> >> >>> * 2c97a68 2016-01-23 | Revert "LUCENE-6937: moving trunk from SVN
to
> >> >>> GIT." Welcome to GIT world. [Dawid Weiss]
> >> >>>
> >> >>> Anyone else see this?
> >> >>>
> >> >>> -Yonik
> >> >>>
> >> >>>
> ---------------------------------------------------------------------
> >> >>> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> >> >>> For additional commands, e-mail: dev-help@lucene.apache.org
> >> >>>
> >> >> --
> >> >> - Mark
> >> >> about.me/markrmiller
> >> >
> >> > --
> >> > Lucene/Solr Search Committer, Consultant, Developer, Author, Speaker
> >> > LinkedIn: http://linkedin.com/in/davidwsmiley | Book:
> >> > http://www.solrenterprisesearchserver.com
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> >> For additional commands, e-mail: dev-help@lucene.apache.org
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> > For additional commands, e-mail: dev-help@lucene.apache.org
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
> --
Lucene/Solr Search Committer, Consultant, Developer, Author, Speaker
LinkedIn: http://linkedin.com/in/davidwsmiley | Book:
http://www.solrenterprisesearchserver.com

Mime
View raw message