Hello, everybody.

Dominique - you are incredible. How do you find the time to do all that
patches? :)

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?

Best wishes,
harnir


-- 
+ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- +
| Maciej Delmanowski  /  http://linux.net.pl/~harnir/  /  GnuPG: 48B03AFE |
+ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- +

Attachment: signature.asc
Description: Digital signature

_______________________________________________
fvwm-crystal-users mailing list
fvwm-crystal-users@gna.org
https://mail.gna.org/listinfo/fvwm-crystal-users

Reply via email to