From: Ilya Basin <basinilya@gmail•com>
To: Git mailing list <git@vger•kernel.org>
Cc: Ray Chen <rchen@cs•umd.edu>, Eric Wong <normalperson@yhbt•net>
Subject: git-svn: problem with svn cp trunk/subdir tags/subdir_1.0
Date: Mon, 29 Apr 2013 16:46:45 +0400 [thread overview]
Message-ID: <1826029946.20130429164645@gmail.com> (raw)
After fixing --preserve-empty-dirs plus --stdlayout a new problem
arised:
When creating a tag or branch from a subdir, a disjoint branch
is created. Then git-svn re-imports the commits using this dir as
strip path.
Why? I would instead keep the current commit as parent, delete
everything except the subdir and move its contents to root directory.
During this re-import the variable %added_placeholder is not up to
date. Because the branch is disjoint, this variable should be empty in
the beginning, but it's not.
Because of that git-svn tries to delete non-existent .gitignore files
and dies.
I think, if a disjoint branch is created, %added_placeholder should be
pushed and cleared. A new set of paths starting with "trunk/" will be
added to it during re-import.
When re-import is done, we should translate the paths to
"tags/subdir_1.0/" and merge with the original %added_placeholder.
next reply other threads:[~2013-04-29 12:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-29 12:46 Ilya Basin [this message]
2013-04-29 13:00 ` git-svn: problem with svn cp trunk/subdir tags/subdir_1.0 Ilya Basin
2013-05-02 18:19 ` Ilya Basin
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=1826029946.20130429164645@gmail.com \
--to=basinilya@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=normalperson@yhbt$(echo .)net \
--cc=rchen@cs$(echo .)umd.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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