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

Rebase and incrementing version numbers

From
MNMichael Nahas <mike.nahas@gmail.com>
Date
Jan 19, 2012, 17:20 UTC
Message-ID
<CADo4Y9iKvoXhKg5pEAB+cbA7Rkfa=nF4TLu0xgcS3dnkNi_n4g@mail.gmail.com>
In-Reply-To
<CADo4Y9jGYJasDL9m7_50aOTrOyoezdyg=vcsZhQ87Qk-1XfTUQ@mail.gmail.com>
I'm at a new job and using Git-SVN at a place that is accustomed to SVN.

The problem I'm running into is that whenever I change a file in a directory, I have to bump up the version number in the configuration file.  The larger version value in the config file causes my changes to be loaded over the old ones.

Most of my commits are edits to a file like "foo.js" and an increment to the version number in "config".  Ideally, each of my features should live in a single commit and I should be able to make a sequence of them, each time incrementing the version number in config.

The problem I'm running into starts with me editing version=100.  I create new commits where I set the version to 101, 102, 103, 104. When I go to push ("git svn dcommit"), my coworkers have incremented the version to 103.  So, I rebase my changes, and get conflicts every time because of the version number!

Is there a good way to avoid these conflicts?  Is there a hook I can write?  Is there a change to this process that would work smoother with Git and its distributed development?  It's okay if the version number skips numbers (e.g., jumps from 100 to 104), as long as it increases.

Thanks,
Mike
Next: demerphq
Message 1 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.