Differences between revisions 2 and 17 (spanning 15 versions)
Revision 2 as of 2006-02-04 18:51:06
Size: 400
Editor: tonfa
Comment: notes to self
Revision 17 as of 2007-08-24 17:46:48
Size: 1803
Editor: tonfa
Comment:
Deletions are marked like this. Additions are marked like this.
Line 10: Line 10:
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)
 * 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 =

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

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


CategoryHomepage

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