Wed Aug 2 17:41:46 IDT 2006 Yuval Kogman <[EMAIL PROTECTED]>
* Correct typo "arror" to "arrow"
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
New patches:
[Correct typo "arror" to "arrow"
Yuval Kogman <[EMAIL PROTECTED]>**20060802144146] {
hunk ./paper/paper.tex 27
- - intermediate state of the repository, an arror represents a patch (and
+ intermediate state of the repository, an arrow represents a patch (and
}
Context:
[add new idea about how resolutions will merge.
David Roundy <[EMAIL PROTECTED]>**20060714115511]
[implement Heffalump's suggestion on live conflict wording.
David Roundy <[EMAIL PROTECTED]>**20060714112413]
[new formulation of the semantics of merges, etc.
David Roundy <[EMAIL PROTECTED]>**20060713124113]
[define trunk and minimal depth for branches.
David Roundy <[EMAIL PROTECTED]>**20060711123925]
[add arjan's soln to my second dilemma
David Roundy <[EMAIL PROTECTED]>**20060711121857]
[add defn of equivalence.
David Roundy <[EMAIL PROTECTED]>**20060711115700]
[more examples of weird conflicts.
David Roundy <[EMAIL PROTECTED]>**20060711114546]
[add working difference prototype.
David Roundy <[EMAIL PROTECTED]>**20060711112812]
[change description of tree invariant.
David Roundy <[EMAIL PROTECTED]>**20060711112427]
[droundy's problem
David Roundy <[EMAIL PROTECTED]>**20060711111315]
[add Igloo's example merge.
David Roundy <[EMAIL PROTECTED]>**20060711103346]
[add prototypes.
David Roundy <[EMAIL PROTECTED]>**20060710111137]
[add some discussion of patch sets and stuff.
David Roundy <[EMAIL PROTECTED]>**20060710110936]
[add example where we just want the A branch.
David Roundy <[EMAIL PROTECTED]>**20060709213903]
[a couple of conflict resolutions.
David Roundy <[EMAIL PROTECTED]>**20060709212558]
[add example using xypic to draw tree.
David Roundy <[EMAIL PROTECTED]>**20060709140030]
[rename subdir to paper.
David Roundy <[EMAIL PROTECTED]>**20060709132719]
[just add makefile and introduction.
David Roundy <[EMAIL PROTECTED]>**20060709132543]
Patch bundle hash:
820f25bb09a19a205796e0b6c520a3bf247fb40d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)
iD8DBQFE0LnPVCwRwOvSdBgRAs4/AJ9StncxmSfWgViFyDg09L8FS6g0EQCgl4qw
5LH24LnN37zSc5YrZysr+Ms=
=I+0p
-----END PGP SIGNATURE-----
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
