Differences between revisions 15 and 16
Revision 15 as of 2006-12-11 00:06:56
Size: 742
Editor: mpm
Comment:
Revision 16 as of 2007-08-24 17:41:16
Size: 2230
Editor: tonfa
Comment:
Deletions are marked like this. Additions are marked like this.
Line 17: Line 17:
= API some people care about =
private static final String HG_MERGE_NEEDED_ERR = "(run 'hg heads' to
see heads, 'hg merge' to merge)";
public static final String HG_MERGE_CONFLICT_ERR = "conflicts detected
in ";
private static final String HG_MERGE_MULTIPLE_HEADS_ERR = "abort: repo
has ";
private static final String HG_MERGE_UNCOMMITTED_ERR = "abort:
outstanding uncommitted merges";
private final static String HG_CREATE_NEW_BRANCH_ERR = "abort: push
creates new remote branches!";
private final static String HG_HEADS_CREATED_ERR = "(+1 heads)";
private static final String HG_NO_REPOSITORY_ERR = "abort: There is no
Mercurial repository here";
private static final String HG_UPDATE_SPAN_BRANCHES_ERR = "abort: update
spans branches";
private static final String HG_ALREADY_TRACKED_ERR = " already tracked!";
private static final String HG_NOT_TRACKED_ERR = " no tracked!";
private static final String HG_NOT_FOUND_ERR = "not found!";
private static final String HG_CANNOT_READ_COMMIT_MESSAGE_ERR = "abort:
can't read commit message";
private static final String HG_UNABLE_EXECUTE_COMMAND_ERR = "unable to
execute hg command";
private static final String HG_UNABLE_CLONE_ERR = "abort: destination ";
private static final String HG_NODE_NAME_ERR = "abort: node name or
service name not known";
private static final String HG_NO_CHANGE_NEEDED_ERR = "no change needed";
private static final String HG_NO_ROLLBACK_ERR = "no rollback
information available";

Benoit Boissinot

Email: MailTo(bboissin AT SPAMFREE gmail DOT com)

Mercurial repository at : http://hg.intevation.org/mercurial/tonfa

notes to self:

  • want to add the parent in dirstate (so that localrepo.changes doesn't report modified after a merge)
  • want to add the base in changegroup (so that full revision can be inserted)

IDEAS

  • Get rid of metadatas in manifest, put them in the filelog (like copies). It makes sense because each change to a file should be reflected at the filelog level.
  • add a delete entry in the filelog and add it to the manifest (that way we know when the head is removed, and 'hg log filename' will show the deletion)

API some people care about

private static final String HG_MERGE_NEEDED_ERR = "(run 'hg heads' to see heads, 'hg merge' to merge)"; public static final String HG_MERGE_CONFLICT_ERR = "conflicts detected in "; private static final String HG_MERGE_MULTIPLE_HEADS_ERR = "abort: repo has "; private static final String HG_MERGE_UNCOMMITTED_ERR = "abort: outstanding uncommitted merges"; private final static String HG_CREATE_NEW_BRANCH_ERR = "abort: push creates new remote branches!"; private final static String HG_HEADS_CREATED_ERR = "(+1 heads)"; private static final String HG_NO_REPOSITORY_ERR = "abort: There is no Mercurial repository here"; private static final String HG_UPDATE_SPAN_BRANCHES_ERR = "abort: update spans branches"; private static final String HG_ALREADY_TRACKED_ERR = " already tracked!"; private static final String HG_NOT_TRACKED_ERR = " no tracked!"; private static final String HG_NOT_FOUND_ERR = "not found!"; private static final String HG_CANNOT_READ_COMMIT_MESSAGE_ERR = "abort: can't read commit message"; private static final String HG_UNABLE_EXECUTE_COMMAND_ERR = "unable to execute hg command"; private static final String HG_UNABLE_CLONE_ERR = "abort: destination "; private static final String HG_NODE_NAME_ERR = "abort: node name or service name not known"; private static final String HG_NO_CHANGE_NEEDED_ERR = "no change needed"; private static final String HG_NO_ROLLBACK_ERR = "no rollback information available";


CategoryHomepage

tonfa (last edited 2011-03-28 21:47:31 by tonfa)