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

Git svn bug on merging svn branches

From
АСАртем Семенов <artem.semenov@jarillolabs.com>
Date
Oct 9, 2018, 23:38 UTC
Message-ID
<49aa05bf-1848-51ca-8b98-5f1796dd8bdf@jarillolabs.com>
Hello.
Git svn bug on merging svn branches:
Svn repository (branches tag trunk).
1. Add a some file by svn tools.
2. Create a new branch by svn tools (e.g. br1) .
3. Create a new branch by svn tools on branch br1 (e.g. br2).
4. Add some changes to file f1 in branch br1. Commit by svn tools.
5. Clone repository by git svn.
6. Create two local branches – br1_svn (on origin/br1) and br2_svn (on 
origin/br2);
7. Checkout to br2_svn. Add some changes (e.g add file f2). Execute git 
add, git commit.
8. Execute “git merge br1_svn”.
9. Checkout to br1_svn.
10. Execute “git svn info” - URL refers to br1. (URL: 
https://127.0.0.1/svn/branchtest/branches/br1)
11. Execute “git merge br2_svn”.
12. Execute “git svn info” - URL refers to br2. (URL: 
https://127.0.0.1/svn/branchtest/branches/br2)
-- 
With my best regards,
  Artem Semenov               mailto:artem.semenov@jarillolabs.com
Next: Andreas Heiduk
Message 1 of 2 in “Git svn bug on merging svn branches”
  1. Артем СеменовOct 9, 2018
  2. Andreas HeidukOct 10, 2018

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.