Browsing the darcs messages, it appears that the conflict resolution algorithm isn't NP-complete. I unrecorded all of my one-offs and still cannot pull the changes. Grrrrrr. ~joe ----- Start Original Message ----- From: "Joe Lapp" <joe.lapp@xxxxxxxxx> To: dokuwiki@xxxxxxxxxxxxx Subject: [dokuwiki] Re: darcs changes > > Hey darcs users, > > I'm trying to do a darcs pull for all mods since 10/17, and darcs hangs after > I indicated 'a' to pull all or 'y' on all the mods. Anyone seen this before? > > If I control-C and darcs pull again, it behaves as if nothing was pulled. > Thanks! > > (Drats, I had just unsubscribed from the darcs users list.) > > ~joe -- DokuWiki mailing list - more info at http://wiki.splitbrain.org/wiki:mailinglist