On Fri, May 22, 2009 at 14:55:25 +1000, Trent W.Buck wrote:
> This bundle updates a stale chapter of the user manual. Thanks to
> Taylor for bringing it to my attention. The subsequent patches are
> vaguely relevant bits that I worked on at the same time (mainly to
> appease the new \ref{}s, at the bottom of the first patch).Applied, thanks! > Fri May 22 13:32:16 EST 2009 Trent W. Buck <[email protected]> > * Rewrite "Repository Formats" chapter. > > Fri May 22 13:52:41 EST 2009 Trent W. Buck <[email protected]> > * Teach preproc's \darcsCommand to use \subsection. > > Fri May 22 14:00:42 EST 2009 Trent W. Buck <[email protected]> > * Remove \subsections subsumed by darcsCommand. > > Fri May 22 14:32:59 EST 2009 Trent W. Buck <[email protected]> > * Churn: rewrite some of initialize_help for readability. Rewrite "Repository Formats" chapter. ------------------------------------- > hunk ./src/formats.tex 56 > +\item The `exponential merge' problem is \emph{far} less likely to > + occur (it can still be produced in deliberately pathological cases). > +\item Identical primitive changes no longer conflict. For example, if > + two patches both attempt to add a directory `tests', these patches > + will not conflict. > +\end{itemize} I recommend looking at Petr's example of real world merge trouble using a darcs-2 format repository. I suspect "deliberately pathological" is over-optimistic. -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9
signature.asc
Description: Digital signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
