Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jgit-dev] Merge in 0.9?

Hi,

> I think it would be a good idea to write down the decision matrix for
> checkout

I have such a matrix. I produced a spreadsheet while I was working on
DirCacheCheckout. See [1]. Please read the legend at the end of doc
first. The sheet is based on information from the "carry-forward
rules" listed in [2] and file/folder conflict rules listed by Shawn in
ReadTreeTest.java [3].

[1] https://spreadsheets.google.com/ccc?key=0Ask8nTwp7sXedElIQWg3bGlINENuNGtlN0lQYVZVSFE&hl=de&authkey=CJn1mC4
[2] http://www.kernel.org/pub/software/scm/git/docs/git-read-tree.html#_two_tree_merge
[2] http://egit.eclipse.org/w/?p=jgit.git;a=blob;f=org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReadTreeTest.java;h=f2bb66fd301a80ce39287ceec42d595e3e83ed22;hb=0e7a38b60fbb88db4c61fd185ec17416540463d2

Ciao
  Chris


Back to the top