Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgRepositoryFiles.java @ 707:42b88709e41d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
706:cd5c87d96315 707:42b88709e41d
31 LastMessage(Home.Repo, "last-message.txt"), 31 LastMessage(Home.Repo, "last-message.txt"),
32 Bookmarks(Home.Repo, "bookmarks"), BookmarksCurrent(Home.Repo, "bookmarks.current"), 32 Bookmarks(Home.Repo, "bookmarks"), BookmarksCurrent(Home.Repo, "bookmarks.current"),
33 Branch(Home.Repo, "branch"), 33 Branch(Home.Repo, "branch"),
34 UndoBranch(Home.Repo, "undo.branch"), UndoDirstate(Home.Repo, "undo.dirstate"), 34 UndoBranch(Home.Repo, "undo.branch"), UndoDirstate(Home.Repo, "undo.dirstate"),
35 Phaseroots(Home.Store, "phaseroots"), FNCache(Home.Store, "fncache"), 35 Phaseroots(Home.Store, "phaseroots"), FNCache(Home.Store, "fncache"),
36 WorkingCopyLock(Home.Repo, "wlock"), StoreLock(Home.Store, "lock"); 36 WorkingCopyLock(Home.Repo, "wlock"), StoreLock(Home.Store, "lock"),
37 MergeState(Home.Repo, "merge/state");
37 38
38 /** 39 /**
39 * Possible file locations 40 * Possible file locations
41 * <ul>
42 * <li>{@link #Root} lives in working copy
43 * <li>{@link #Repo} files under <samp>.hg/</samp>
44 * <li>#{@link #Store} files in storage area, either <samp>.hg/store/</samp> or <samp>.hg/</samp>
45 * </ul>
40 */ 46 */
41 public enum Home { 47 public enum Home {
42 Root, Repo, Store 48 Root, Repo, Store
43 } 49 }
44 50