I have hit exponential time in "darcs pull". It has been running for 8 hours
now, with no sign of stopping. This has happened to me before, but in
the past
I have always been able to resolve the issue with unrecord and hand-merging.
The problem is that at the moment I am working in a long-running
experimental
branch that I want to merge with pulled in changes from the upstream
mainline
branch. To unrecord to a "common state", I will essentially have to unrecord
all the changes in this branch (a lot). Still, if this is what I have to
do, I
guess it could be done, but I would like to know if there are any other
options?
It seems that whenever we run into this kind of behavior, it is our
.vcproj files
that cause the problem. We have lots of different configurations, they
tend to
change frequently and they are partly auto-generated. When we get
conflicts it is
almost always in these files.
For the future, maybe the .vcproj files should not be kept in darcs
(even though that
will cause some inconvenice), but for now -- is there any way of solving
this
issue. Can I somehow tell darcs to ignore the .vcproj files? I can always
fix them by hand, it will be faster than waiting for "darcs pull" to finish.
Or should I just swallow the red pill and start unrecording?
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
