On Sun, Nov 27, 2005 at 12:34:36AM +0000, Daniel Carrera wrote: > 1. Joel makes another copy of stable > cp -r foo/ stable/ > cd stable > darcs unrecord > 2. Jane sends patch B to Joel. > 3. Joel applies patch B to his copy of stable. > 4. Joel now has a local copy of Jane's tree and can do the merge. > Is this the correct solution? Or is Darcs smart enough to do this merge > automatically? If so, how?
I think there is a FAQ about this: http://darcs.net/DarcsWiki/FrequentlyAskedQuestions#head-6518424ab7ac0729e9c09d365886d22da9f5f0f4 :) pp -- ++ Blog: http://blog.rsise.anu.edu.au/?q=pietro ++ ++ "All great truths begin as blasphemies." -George Bernard Shaw ++ Please avoid sending me Word or PowerPoint attachments. See http://www.fsf.org/philosophy/no-word-attachments.html _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
