From: Peter Baumann <waste.manager@gmx.de>
To: Eric Wong <normalperson@yhbt.net>
Cc: Junio C Hamano <gitster@pobox.com>,
"Marcus D. Hanwell" <marcus@cryos.net>,
git@vger.kernel.org
Subject: Re: [PATCH] git-svn: handle our top-level path is deleted and later re-added
Date: Sat, 15 Dec 2007 17:35:03 +0100 [thread overview]
Message-ID: <20071215163503.GA25053@xp.machine.xx> (raw)
In-Reply-To: <20071214163909.GA18300@soma>
On Fri, Dec 14, 2007 at 08:39:09AM -0800, Eric Wong wrote:
> 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
prev parent reply other threads:[~2007-12-15 16:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-10 0:24 git-svn init from Avogadro SVN repo - deleted files showing Marcus D. Hanwell
2007-12-10 10:42 ` Peter Baumann
2007-12-10 11:40 ` Peter Baumann
2007-12-13 16:41 ` Eric Wong
2007-12-13 18:13 ` Peter Baumann
2007-12-14 16:39 ` [PATCH] git-svn: handle our top-level path is deleted and later re-added Eric Wong
2007-12-14 16:43 ` Eric Wong
2007-12-15 0:24 ` cho
2007-12-15 16:35 ` Peter Baumann [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071215163503.GA25053@xp.machine.xx \
--to=waste.manager@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=marcus@cryos.net \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.