Re: [PATCH] git-svn: handle our top-level path is deleted and later re-added
- From
- Peter Baumann <waste.manager@gmx.de>
- Date
- Dec 15, 2007, 16:35 UTC
- Message-ID
- <20071215163503.GA25053@xp.machine.xx>
- In-Reply-To
- <20071214163909.GA18300@soma>
On Fri, Dec 14, 2007 at 08:39:09AM -0800, Eric Wong wrote:
Show 18 quoted lines
> Previously, git-svn would ignore cases where the path we're > tracking is removed from the repository. This was to prevent > heads with follow-parent from ending up with a tree full of > empty revisions (and thus breaking rename detection). > > The previous behavior is fine until the path we're tracking > is re-added later on, leading to the old files being merged > in with the new files in the directory (because the old > files were never marked as deleted) > > We will now only remove all the old files locally that were > deleted remotely iff we detect the directory we're in is being > created from scratch. > > Thanks for Marcus D. Hanwell for the bug report and > Peter Baumann for the analysis. > > Signed-off-by: Eric Wong <normalperson@yhbt.net>
[...]
It seems to solve the problem seen in the avogadro repo. At least the suspicious revisions I checked looked identical in the imported version.
-Peter