2007/10/18, Stephen J. Turnbull <[EMAIL PROTECTED]>: > "Just keep feeding" is not concrete enough to be simple.
Here is a nice shell script doing conflicting changes in two repos, R2 pulls from R1, then Resolving the 4th conflict takes some 0.5 seconds, 5th conflict takes some 15 seconds and 6th conflict takes some 500 seconds. People with more cycles to spare can run the script to the bitter end. In my experience, more complex conflict resolution cases lead to 1) unexpected data loss 2) darcs politely requesting me to bug people on [EMAIL PROTECTED] -- Pekka.Pessi mail at nokia.com
misery.sh
Description: Bourne shell script
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
