Re: [fossil-users] Enhancement: commit and close merged leaf

2013/8/2 Jan Nijtmans : > If the merged is not a leaf anymore, due to the commit itself, I > would expect this function to protect from adding a "closed" tag > (even though it doesn't really harm here). > > Hm. Bug fixed here: Thanks very

Re: [fossil-users] Enhancement: commit and close merged leaf

2013/8/2 Jan Nijtmans : > 2013/8/2 Andy Bradford > : >> Does this mean that the merged fork is no longer a leaf at all? If this >> is the case, why assign a closed tag to it? ... > Using "--integrate" makes it impossible for the person > who created the fork to do further commits on the fork. At

Re: [fossil-users] Enhancement: commit and close merged leaf

2013/8/2 Andy Bradford : > Does this mean that the merged fork is no longer a leaf at all? If this > is the case, why assign a closed tag to it? I never tried "fossil merge --integrate" for merging a fork before, but it seems to me that assigning a closed tag to it makes a slight difference. Usin

Re: [fossil-users] Enhancement: commit and close merged leaf

Thus said Jan Nijtmans on Thu, 01 Aug 2013 10:03:36 +0200: > Thanks for your testing and your feedback! It's on trunk now. I used > "merge --integrate" when doing that. One other thing I noticed is that when merging in a forked trunk with --integrate, it will explicitly close the trunk, whi

Re: [fossil-users] Enhancement: commit and close merged leaf

2013/8/1 Andy Bradford : > By the way, I like the option. Making it possible to close the leaf with > the merge/commit is quite nice. > > I even tried to trick it by doing: > > fossil merge --integrate > > And it ignored the fact that it wasn't a leaf and just did a normal > merge. Nice! Tha

Re: [fossil-users] Enhancement: commit and close merged leaf

Thus said "Andy Bradford" on 31 Jul 2013 20:37:19 -0600: > It might be a little late in the game, but why is it called integrate? > Maybe I missed the discussion about why it is called that---I'll scour > the archives. After reading the archives it does appear that --integrate, while not quite

Re: [fossil-users] Enhancement: commit and close merged leaf

Thus said Jan Nijtmans on Tue, 30 Jul 2013 10:11:52 +0100: > > > Still no objections, anyone? I think it's ready to be integrated into > trunk (using "merge --integrate", of course), but another round of > evaluation never hurts! It

Re: [fossil-users] Enhancement: commit and close merged leaf

2013/7/30 Lluís Batlle i Rossell : > But maybe it should not run unless in 'integrate' mode? That's not possible. This code is part of "fossil commit" while the --integrate option is from "fossil merge". The "fossil commit" needs to know whether a previous "fossil merge" had the --integrate option

Re: [fossil-users] Enhancement: commit and close merged leaf

On Tue, Jul 30, 2013 at 10:45:31AM +0100, Jan Nijtmans wrote: > 2013/7/30 Lluís Batlle i Rossell : > > About the code starting at line 1693, it looks to me like it runs in any > > case. > > Does this change only add a new "--integrate", or it also changes the > > behaviour > > of usual merges? >

Re: [fossil-users] Enhancement: commit and close merged leaf

2013/7/30 Lluís Batlle i Rossell : > About the code starting at line 1693, it looks to me like it runs in any case. > Does this change only add a new "--integrate", or it also changes the > behaviour > of usual merges? That code does an additional pass over the vmerge table, in order to determine

Re: [fossil-users] Enhancement: commit and close merged leaf

2013/7/30 Lluís Batlle i Rossell : > Why INTEGR, and not INTEGRATE? 2013/7/30 Stephan Beal : > For a moment i thought you were trying to save 1 byte from INTEGER and i was > going to heckle you about it ;). But i see now that it's INTEGRATE. How > about ..._BY_INTEGR8? LOL Well, the colums are no

Re: [fossil-users] Enhancement: commit and close merged leaf

On Tue, Jul 30, 2013 at 11:11 AM, Jan Nijtmans wrote: > I made one additional change: adding states > UPDATED_BY_INTEGR and ADDED_BY_INTEGR > For a moment i thought you were trying to save 1 byte from INTEGER and i was going to heckle you about it ;). But i see now that it's INTEGRATE. How about

Re: [fossil-users] Enhancement: commit and close merged leaf

On Tue, Jul 30, 2013 at 10:11:52AM +0100, Jan Nijtmans wrote: > 2013/7/12 Stephan Beal : > > On Fri, Jul 12, 2013 at 10:25 AM, Jan Nijtmans wrote: > >> Well, just try out the "merge-integrate" branch. I would say > >> the glass is full again.;-) > > > > Indeed it is! i like what you've done :)

Re: [fossil-users] Enhancement: commit and close merged leaf

2013/7/12 Stephan Beal : > On Fri, Jul 12, 2013 at 10:25 AM, Jan Nijtmans wrote: >> Well, just try out the "merge-integrate" branch. I would say >> the glass is full again.;-) > > Indeed it is! i like what you've done :) I made one additional change: adding states UPDATED_BY_INTEGR and ADDED_B

Re: [fossil-users] Enhancement: commit and close merged leaf

On Fri, Jul 12, 2013 at 10:25 AM, Jan Nijtmans wrote: > 2013/7/10 Stephan Beal : > > i think i just went from "glass half full" to "glass half empty" on this > > topic :/. > > Well, just try out the "merge-integrate" branch. I would say > the glass is full again.;-) > Indeed it is! i like wha

Re: [fossil-users] Enhancement: commit and close merged leaf

Am 12.07.2013 10:25, schrieb Jan Nijtmans: > Well, just try out the "merge-integrate" branch. I would say > the glass is full again.;-) Congratulation, very impressive ! - Harald ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://

Re: [fossil-users] Enhancement: commit and close merged leaf

2013/7/11 Harald Oehlmann : > Looks really helpful and well thought (but I am even more in Stephans > position to stay quiet due to big lack of understanding...) Implementation is complete now and well-tested in the "merge-integrate" branch. Feedback welcome! Closing a branch could also be done in

Re: [fossil-users] Enhancement: commit and close merged leaf

Am 11.07.2013 11:07, schrieb Jan Nijtmans: > 2013/7/10 Stephan Beal : >> That well surpasses my understanding of how merging is tracked, so i'll just >> be quiet now ;). > > Well, merge-tracking is a part of fossil which I understand very > well. So I did just a little bit hacking: Jan, you are s

Re: [fossil-users] Enhancement: commit and close merged leaf

2013/7/10 Stephan Beal : > That well surpasses my understanding of how merging is tracked, so i'll just > be quiet now ;). Well, merge-tracking is a part of fossil which I understand very well. So I did just a little bit hacking: It ac

Re: [fossil-users] Enhancement: commit and close merged leaf

On Wed, Jul 10, 2013 at 4:56 PM, Jan Nijtmans wrote: > 2013/7/10 Stephan Beal : > > To me closing at merge time sounds like the overall easier approach (but > i'm > > very possibly ignoring/missing details/complications which i'm hoping > > another list member will point out) > Sometimes i'm

Re: [fossil-users] Enhancement: commit and close merged leaf

2013/7/10 Stephan Beal : > i might have over-thought that problem: closing on merge "probably" isn't a > problem here because if the leaf is closed that doesn't hinder us at all. > Closing a leaf keeps us from committing to it, but not from pulling from it. > To me closing at merge time sounds like

Re: [fossil-users] Enhancement: commit and close merged leaf

On Wed, Jul 10, 2013 at 11:57 AM, Harald Oehlmann < harald.oehlm...@elmicron.de> wrote: > Am 10.07.2013 11:51, schrieb Stephan Beal: > ... > > Closing at merging is also not ideal because it often happens that a > > merge gets tossed out in the process of trying to fix conflicts (very > > often i

Re: [fossil-users] Enhancement: commit and close merged leaf

Am 10.07.2013 11:51, schrieb Stephan Beal: > On Wed, Jul 10, 2013 at 9:37 AM, Harald Oehlmann > mailto:harald.oehlm...@elmicron.de>> wrote: > > 1) fossil open repo > 2) fossil merge branch > 3) fossil commit > 4) And then, I go to the web interface and set the "closed leaf" > p

Re: [fossil-users] Enhancement: commit and close merged leaf

On Wed, Jul 10, 2013 at 9:37 AM, Harald Oehlmann < harald.oehlm...@elmicron.de> wrote: > 1) fossil open repo > 2) fossil merge branch > 3) fossil commit > 4) And then, I go to the web interface and set the "closed leaf" > property of the branch. > > The last step would be natural for me to de done

[fossil-users] Enhancement: commit and close merged leaf

Following hint by Andreas: https://groups.google.com/forum/#!topic/comp.lang.tcl/JwSNrTYgjTk the following enhancement to fossil is proposed: with "fossil commit", there should be a possibility (parameter) to close a merged branch. So here is a current typical session to merge a branch to trunk