RE: Branches branch_5x and master have force-updated heads (!)

2016-01-24 Thread Uwe Schindler
.de eMail: u...@thetaphi.de > -Original Message- > From: Dawid Weiss [mailto:dawid.we...@gmail.com] > Sent: Sunday, January 24, 2016 6:39 PM > To: dev@lucene.apache.org > Subject: Re: Branches branch_5x and master have force-updated heads (!) > > > (as I had no changes in m

RE: Branches branch_5x and master have force-updated heads (!)

2016-01-24 Thread Uwe Schindler
wid.we...@gmail.com] > Sent: Sunday, January 24, 2016 6:06 PM > To: dev@lucene.apache.org > Subject: Branches branch_5x and master have force-updated heads (!) > > Hello, > > Several people reported problems with the fact that git history > included the "wipeout-and-re

Branches branch_5x and master have force-updated heads (!)

2016-01-24 Thread Dawid Weiss
Hello, Several people reported problems with the fact that git history included the "wipeout-and-revert" pair of commits imported from the SVN history. The problems seem to be: 1) every file has a pair of two commits (removal/ restore), 2) not every tool shows file history past the removal

Re: Branches branch_5x and master have force-updated heads (!)

2016-01-24 Thread Dawid Weiss
> (as I had no changes in my checkout, I just pulled the branches from remote > replacing the local one) I don't know what you did, but it it wasn't pulling ;) Here is a bit of git parlance overview: - You "fetch" new commits and reference updates (git fetch origin). - A "pull" is basically