On 24/03/2008, Karl Hasselström <kha@xxxxxxxxxxx> wrote: > 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
