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

Re[2]: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()

From
IBIlya Basin <basinilya@gmail.com>
Date
May 1, 2013, 19:51 UTC
Message-ID
<455264907.20130501235104@gmail.com>
In-Reply-To
<7vhaim8w48.fsf@alter.siamese.dyndns.org>

JCH> ...and you want to perform a merge on the JCH> Git side of that branch with another Git branch that does have real JCH> contents in that directory, you would want the result to say "This JCH> directory no longer is just for a placeholder", but you cannot say JCH> that globally by updating the config file Placeholder files are managed when fetching from SVN. SVN doesn't support Git-like merges.

JCH> comment line "# added by git-svn only to keep the directory" and JCH> consider a directory that has nothing but .gitignore that consists JCH> of only that exact comment line an "added placeholder" directory to JCH> work it around. Sounds good, but it's not I who decided to use the config file.

Previous: Junio C HamanoNext: Eric Wong
Message 4 of 18 in “Re: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()”
  1. Ilya BasinMay 1, 2013
  2. Re[2]: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()Ilya Basin, May 1, 2013
  3. Junio C HamanoMay 1, 2013
  4. Re[2]: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()Ilya Basin, May 1, 2013
  5. Eric WongMay 1, 2013
  6. Junio C HamanoMay 1, 2013
  7. Eric WongMay 2, 2013
  8. Re[2]: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()Ilya Basin, May 2, 2013
  9. Eric WongMay 2, 2013
  10. Re[2]: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()Ilya Basin, May 3, 2013
  11. Re[3]: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()Ilya Basin, May 3, 2013
  12. Re[4]: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()Ilya Basin, May 6, 2013
  13. Re[3]: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()Ilya Basin, May 6, 2013
  14. Eric WongMay 9, 2013
  15. Re[4]: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()Ilya Basin, May 28, 2013
  16. Ray ChenMay 2, 2013
  17. Re[2]: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()Ilya Basin, May 2, 2013
  18. Eric WongMay 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.