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

Re: [spf:guess] Re: [PATCH 2/5] git-svn: Make merge metadata accessible to make_log_entry

From
Alex Vandiver <alex@chmrr.net>
Date
Dec 5, 2009, 23:10 UTC
Message-ID
<1260054349-sup-9732@utwig>
In-Reply-To
<1260053972.22680.5.camel@denix>
At Sat Dec 05 17:59:32 -0500 2009, Sam Vilain wrote:
Show 6 quoted lines
> Hi, I've just seen the series, looks like a good idea.  Just a couple of
> questions then I'll review the code;
> 
>  - when a change is merged upstream with svk, you will get multiple log
> entries in a single commit message.  What do you do with commits like
> that?

If the user edited the merge message and supplied their own message, nothing. If the first line is an SVK merge line, it inserts a message "Merged from /svn/path/to/trunk:12345\n\n" at the top.

>  - there are quite a few repos which will have empty commits (ie, no
> changes), but with one or more of the above log entries, owing to a bug
> which I can't seem to find the details of right now..  how might those
> appear?
Without seeing an example, I'm not sure offhand -- but what you're
describing does ring a bell, so I'm sure I've seen the mismerges
you're talking about as well.
 - Alex
-- 
Networking -- only one letter away from not working
Previous: Sam VilainNext: Alex Vandiver
Message 8 of 12 in “git-svn: svk log message cleanup”
  1. 0/5 git-svn: svk log message cleanupAlex Vandiver, Dec 2, 2009
  2. 1/5 git-svn: Allow setting the committer and author date separatelyAlex Vandiver, Dec 2, 2009
  3. 2/5 git-svn: Make merge metadata accessible to make_log_entryAlex Vandiver, Dec 2, 2009
  4. Alex VandiverDec 2, 2009
  5. Eric WongDec 5, 2009
  6. Alex VandiverDec 5, 2009
  7. Sam VilainDec 5, 2009
  8. Alex VandiverDec 5, 2009
  9. Alex VandiverDec 19, 2009
  10. 3/5 git-svn: Strip SVK headers, optionally parsing author informationAlex Vandiver, Dec 2, 2009
  11. 4/5 git-svn: Provide a default "empty commit message" so the metadata is not the headerAlex Vandiver, Dec 2, 2009
  12. 5/5 git-svn: Correct a copy-and-pasted misleading commentAlex Vandiver, Dec 2, 2009

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.