Le Sun, 13 May 2007 19:42:32 +0200, Maciej Delmanowski <[EMAIL PROTECTED]> a écrit :
> Hello, everybody. > > Dominique - you are incredible. How do you find the time to do all that > patches? :) > When I am not doing something else as working, going for a walk with the dogs, being with my family, and so on. Generally when I am watching some bad TV program. > I, on the other hand, am behind the scheudle. The biggest problem that I have > now, is how to merge my own Crystal repository with Dominique's own repo. > Conflicts are caused by previous Dominique patches, which I've applied by > email. In other words, every patch that I apply directly from Dominique's > darcs repo, makes a conflict. I've tried to resolve these conflicts one by > one, but the result was terrible - darcs slowed with each patch almost > exponentially. > > So I have an issue now - Dominiques repository is more complete than my own, > and merging became unpractical if not impossible. So I have an idea, that the > quickier and cleaner method would be to just remove my current Crystal repo, > put Dominique's repo in it's place and continue from that. > > The problem will be with compatibility between new repository, and your > current ones - there may be issues with patches, conflicts, etc. I've tested > that scenario by merging patches from my repository to Dominique's repo, and > there was only one patch which applied cleanly. > > I don't want to make sudden changes in the main Crystal repo, but the > situation seems clear - making a "reset" will be easier than resolving > conflicts by hand. So, I'm asking you for an opinion - if this change will be > OK? > Alternatively I can send the patches I made from the 28 april. They are 58 already! The first one is called 'Fixed wrong keybindings in Application-Ardour'. I also was talking with Thomas Adam on IRC. He helped me to fix a quoting issue with Music-mplayer (even if I ended in a different way with a wrapper script that solved this) but was very evasive about the bugs in fvwm-crystal.generate-menu. He just said something like what he was slowly working on it, so we can hope to hear from him in the future. He don't even talk me what kind of bugs it was or how it is possible to reproduce them. Ciao, Dominique > Best wishes, > harnir > > _______________________________________________ fvwm-crystal-users mailing list fvwm-crystal-users@gna.org https://mail.gna.org/listinfo/fvwm-crystal-users
