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

Re: Git (svn) merge - but ignore certain commits?

From
PLPeter Valdemar Mørch (Lists) <4ux6as402@sneakemail.com>
Date
Jan 8, 2009, 17:49 UTC
Message-ID
<49663CA2.90102@sneakemail.com>
In-Reply-To
<eaa105840812271617n74406517x3335a05d224f5e0@mail.gmail.com>
First, a well-overdue thanks to Peter for your post.
Peter Harris git-at-peter.is-a-geek.org |Lists| wrote:
> If your branch is so ugly that you want to toss many of the commits
> anyway, maybe "git merge --squash" is what you are looking for? Or
> maybe you want to "git rebase -i" before merging?

It isn't. The whole reason for the branch was that there were 4 "beta-level" commits on trunk/master along with a whole bunch of good stuff. And we wanted to add a little more good stuff, exclude the beta stuff and create a release.

Show 5 quoted lines
>> How do I do this "properly"?
> 
> Use many short-lived feature branches, not few long-lived generic
> "development" branches. Merge-and-delete is easier than herding
> reverts.

I don't understand this, I'm affraid. Our "newbranch" was very short lived. 4 reverts and 5 commits.

What I ended up doing was to create two git branches off of svn "newbranch": One with all the fixes but without the reverts, and one with just the reverts. Do all the development on the one with the fixes, and then "git merge" them to both master and "gitnewbranch", then one with the reverts. And then git svn dcommit them both.

However *the* problem was with repeated merges: I later discovered a problem on the branch and need to add a commit for it to both master and newbranch/gitnewbranch. Aside from git cherry-pick (where I take care of the repeated merge problem) I still haven't found a good solution.

I ended up using git cherry-pick, and diff and patch / git diff and git apply. Sub-optimal. :-( But small commits! :-)

Peter
-- 
Peter Valdemar Mørch
http://www.morch.com
Previous: Peter HarrisNext: Peter Harris
Message 3 of 6 in “Git (svn) merge - but ignore certain commits?”
  1. Peter Valdemar Mørch (Lists)Dec 27, 2008
  2. Peter HarrisDec 28, 2008
  3. Peter Valdemar Mørch (Lists)Jan 8, 2009
  4. Peter HarrisJan 8, 2009
  5. Peter Valdemar Mørch (Lists)Jan 8, 2009
  6. Peter HarrisJan 8, 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.