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

Re: Rebase and incrementing version numbers

From
Jeff King <peff@peff.net>
Date
Jan 25, 2012, 02:09 UTC
Message-ID
<20120125020903.GA21535@sigill.intra.peff.net>
In-Reply-To
<CAH3Anro8T4SJqBvw1E_7u__4kYyB6hMCYPbtHSVxkgSUYSb2+A@mail.gmail.com>
On Fri, Jan 20, 2012 at 08:33:57AM +1100, Jon Seymour wrote:
Show 7 quoted lines
> I wonder if you can defer your changes to the config files until after
> you have synced with the current SVN head, so that you typically only
> modify the latest configuration file. Then use git to work out what
> numbers you have to update (by working out which files you changed
> that the SVN upstream has not seen yet). Not perfect, because of race
> conditions, and may not work with your integration testing processes,
> but perhaps worth considering.

That was my thought, too (assuming this workflow, which seems slightly insane, is outside your power to change).

In this list here:
Show 10 quoted lines
> Something like:
> 
> 1. pull latest SVN
> 2. work on file
> 3. test. skip back to 2 until done.
> 4. ready to push to upstream
> 5. pull latest SVN
> 6. calculate configuration changes required
> 7. apply configuration changes
> 8. push work + configuration changes upstream

Steps 5 and 8 are basically "git svn dcommit". I suspect you could use some combination of "git svn rebase" and "git filter-branch" to rewrite your commits with the right counters, and then dcommit the result (hopefully fast enough to avoid races).

-Peff
Previous: Jon Seymour
Message 16 of 16 in “Rebase and incrementing version numbers”
  1. Michael NahasJan 19, 2012
  2. demerphqJan 19, 2012
  3. Michael NahasJan 19, 2012
  4. PJ WeisbergJan 19, 2012
  5. Michael NahasJan 19, 2012
  6. Santi BéjarJan 19, 2012
  7. John SzakmeisterJan 25, 2012
  8. Carlos Martín NietoJan 19, 2012
  9. Michael NahasJan 19, 2012
  10. Carlos Martín NietoJan 20, 2012
  11. Christian CouderJan 25, 2012
  12. Carlos Martín NietoJan 25, 2012
  13. Christian CouderJan 25, 2012
  14. Jehan BingJan 19, 2012
  15. Jon SeymourJan 19, 2012
  16. Jeff KingJan 25, 2012

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.