Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/HgRepositoryFiles.java @ 707:42b88709e41d
Merge: support 'unresolved' resolution with MergeStateBuilder
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Fri, 16 Aug 2013 19:22:59 +0200 |
| parents | c75297c17867 |
| children | a62079bc422b |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgRepositoryFiles.java Fri Aug 16 14:54:09 2013 +0200 +++ b/src/org/tmatesoft/hg/repo/HgRepositoryFiles.java Fri Aug 16 19:22:59 2013 +0200 @@ -33,10 +33,16 @@ Branch(Home.Repo, "branch"), UndoBranch(Home.Repo, "undo.branch"), UndoDirstate(Home.Repo, "undo.dirstate"), Phaseroots(Home.Store, "phaseroots"), FNCache(Home.Store, "fncache"), - WorkingCopyLock(Home.Repo, "wlock"), StoreLock(Home.Store, "lock"); + WorkingCopyLock(Home.Repo, "wlock"), StoreLock(Home.Store, "lock"), + MergeState(Home.Repo, "merge/state"); /** - * Possible file locations + * Possible file locations + * <ul> + * <li>{@link #Root} lives in working copy + * <li>{@link #Repo} files under <samp>.hg/</samp> + * <li>#{@link #Store} files in storage area, either <samp>.hg/store/</samp> or <samp>.hg/</samp> + * </ul> */ public enum Home { Root, Repo, Store