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

Re: [StGit PATCH 0/6] Two bugfixes

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Mar 24, 2008, 09:16 UTC
Message-ID
<b0943d9e0803240216p2000dc23i41580ecc15102cd5@mail.gmail.com>
In-Reply-To
<20080324083550.GB23337@diana.vm.bytemark.co.uk>
On 24/03/2008, Karl Hasselström <kha@treskal.com> wrote:
Show 13 quoted lines
> On 2008-03-20 15:19:12 +0000, Catalin Marinas wrote:
>
>  > BTW, I have about 5 patches that apply to the stable and master
>  > branch, mainly UI updates I needed recently (like picking multiple
>  > patches at once). Since the master branch still needs some work
>  > (which I'll try to help with), maybe it's worth releasing a 0.14.2,
>  > together with some of the bugs reported so far.
>
>
> Absolutely. I think it would be worthwhile to treat "stable" much like
>  Junio handles his "maint" -- apply minor and/or important fixes there,
>  and release minor releases from it somewhat frequently. And merge it
>  to master often, so that master always has everything stable has.

I'll try to release 0.14.2 today or tomorrow as I'll be on holiday afterwards for 2.5 weeks.

BTW, on the master branch, I noticed that StackTransaction.push_patch() checks whether the patch is empty before pushing it. The behaviour on stable is that it reports whether it's empty after push (just like "modified", so that you know that a patch no longer has data as a result of the merge).

On the merging side during push, we have to add the plain patch applying first followed by a three-way merge. Do we ever need the Index.merge() function (implemented with git-read-tree) or should we should always uses the git-recursive-merge in IndexAndWorktree.merge()?

-- 
Catalin
Previous: Karl HasselströmNext: Karl Hasselström
Message 10 of 14 in “Two bugfixes”
  1. 0/6 Two bugfixesKarl Hasselström, Mar 20, 2008
  2. 1/6 Use a special exit code for bugsKarl Hasselström, Mar 20, 2008
  3. 2/6 Make sure patches with no parents have an empty list of parentsKarl Hasselström, Mar 20, 2008
  4. 3/6 Try uncommitting a commit with not exactly one parentKarl Hasselström, Mar 20, 2008
  5. 4/6 Make sure that we only uncommit commits with exactly one parentKarl Hasselström, Mar 20, 2008
  6. 5/6 New test: conflicting push in dirty worktreeKarl Hasselström, Mar 20, 2008
  7. 6/6 Handle failed pushes differently depending on causeKarl Hasselström, Mar 20, 2008
  8. Catalin MarinasMar 20, 2008
  9. Karl HasselströmMar 24, 2008
  10. Catalin MarinasMar 24, 2008
  11. Karl HasselströmMar 24, 2008
  12. Catalin MarinasMar 25, 2008
  13. Karl HasselströmMar 25, 2008
  14. Catalin MarinasMar 25, 2008

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.