Mercurial > hg > easyhg

comparison hgaction.h @ 163:5c262ac73948

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* First cut of work on merge/resolve logic
author Chris Cannam
date Fri, 03 Dec 2010 19:35:04 +0000
parents 910c2c5d1873
children 4bad3c5c053a
comparison
equal deleted inserted replaced
162:910c2c5d1873 163:5c262ac73948
25 { 25 {
26 ACT_NONE, 26 ACT_NONE,
27 ACT_QUERY_PATHS, 27 ACT_QUERY_PATHS,
28 ACT_QUERY_BRANCH, 28 ACT_QUERY_BRANCH,
29 ACT_STAT, 29 ACT_STAT,
30 ACT_RESOLVE_LIST,
30 ACT_QUERY_HEADS, 31 ACT_QUERY_HEADS,
31 ACT_QUERY_PARENTS, 32 ACT_QUERY_PARENTS,
32 ACT_LOG, 33 ACT_LOG,
33 ACT_LOG_INCREMENTAL, 34 ACT_LOG_INCREMENTAL,
34 ACT_REMOVE, 35 ACT_REMOVE,
43 ACT_FOLDERDIFF, 44 ACT_FOLDERDIFF,
44 ACT_CHGSETDIFF, 45 ACT_CHGSETDIFF,
45 ACT_UPDATE, 46 ACT_UPDATE,
46 ACT_REVERT, 47 ACT_REVERT,
47 ACT_MERGE, 48 ACT_MERGE,
48 ACT_RESOLVE_LIST,
49 ACT_SERVE, 49 ACT_SERVE,
50 ACT_RESOLVE_MARK, 50 ACT_RESOLVE_MARK,
51 ACT_RETRY_MERGE, 51 ACT_RETRY_MERGE,
52 ACT_TAG, 52 ACT_TAG,
53 ACT_HG_IGNORE, 53 ACT_HG_IGNORE,