On Thu, Jan 17, 2008 at 01:57:23PM +1100, William Uther wrote: > > If I have two Darcs workspaces, each of which have the same set of > patches, but in different orders, should these workspaces be > identical (even in the presence of conflicts)?
The pristine trees should be, but the way the conflicts are marked in the working directory need not be. > # Now we'll check for differences in the result > cd .. > diff site2/myfile site3/myfile $ diff -q site2/myfile site3/myfile && echo OK Files site2/myfile and site3/myfile differ $ diff -q site2/_darcs/pristine/myfile site3/_darcs/pristine/myfile && echo OK OK Thanks Ian _______________________________________________ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel