git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lars Schneider <larsxschneider@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Elijah Newren <newren@gmail.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: [BUG] Symbolic links break "git fast-export"?
Date: Sun, 30 Jun 2019 06:05:29 -0700	[thread overview]
Message-ID: <25624E1D-55F1-466D-92E0-F06C1909F920@gmail.com> (raw)
In-Reply-To: <20190624185835.GA11720@sigill.intra.peff.net>



> On Jun 24, 2019, at 11:58 AM, Jeff King <peff@peff.net> wrote:
> 
> On Mon, Jun 24, 2019 at 06:33:38AM -0600, Elijah Newren wrote:
> 
>> We should probably also make a corresponding improvement to
>> fast-import; it also makes some attempts to be smart about handling
>> order of modifies and deletes, but misses this case.  See commit
>> 253fb5f8897d ("fast-import: Improve robustness when D->F changes
>> provided in wrong order", 2010-07-09).  It'd be nice if fast-import
>> could go through the list of changes, apply the deletes first, then
>> the modifies -- although I'm not sure where renames go in the order
>> off the top of my head.
> 
> You'd have to split the renames into separate delete/adds, since they
> can have a circular dependency. E.g. renaming "foo" to "bar" and "bar"
> to "foo", you must remove "foo" and "bar" both, and then add them back
> in.

@peff: Can you give me a hint how one would perform this circular
dependency in a single commit? I try to write a test case for this.

Thank you,
Lars


  reply	other threads:[~2019-06-30 13:06 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-24 11:03 [BUG] Symbolic links break "git fast-export"? Lars Schneider
2019-06-24 12:33 ` Elijah Newren
2019-06-24 18:58   ` Jeff King
2019-06-30 13:05     ` Lars Schneider [this message]
2019-06-30 18:28       ` Johannes Sixt
2019-07-01 17:45         ` Elijah Newren
2019-06-30 14:01   ` Lars Schneider
2019-07-01 18:02     ` Elijah Newren
2019-06-24 12:55 ` Elijah Newren

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=25624E1D-55F1-466D-92E0-F06C1909F920@gmail.com \
    --to=larsxschneider@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    --cc=peff@peff.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).