git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git-svn: problem with svn cp trunk/subdir tags/subdir_1.0

From
IBIlya Basin <basinilya@gmail.com>
Date
Apr 29, 2013, 12:46 UTC
Message-ID
<1826029946.20130429164645@gmail.com>

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: Ilya Basin
Message 1 of 3 in “git-svn: problem with svn cp trunk/subdir tags/subdir_1.0”
  1. Ilya BasinApr 29, 2013
  2. Ilya BasinApr 29, 2013
  3. Ilya BasinMay 2, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.