- May 27, 2005
-
-
mpm authored
.hgpaths is a file with lines of the form: <symbolic name> <repository path or url> that allows you to do: hg merge <name>
-
mpm authored
We currently don't support merging from the tip into the working directory, so merge with outstanding local changes is asking for trouble.
-
mpm authored
-
mpm authored
-
mpm authored
-
- May 26, 2005
-
-
mpm authored
-
mpm authored
-
mpm authored
This adds a simple new tags page to browse by tag, adds the tag link everywhere, and adds manifest links to the tags and changelog pages.
-
mpm authored
-
mpm authored
-
mpm authored
-
mpm authored
This lets hg serve work with no args.
-
mpm authored
Add them to the help display, have them report failure
-
mpm authored
This adds an interface to transaction to rollback with a given journal file and commands to rollback an existing .hg/journal or .hg/undo.
-
mpm authored
This is a first pass at implementing repo locking. Next up, journal recovery and undo.
-
mpm authored
-
mpm authored
This gives an example of how to easily use hgweb via CGI
-
mpm authored
This adds a simple stand-alone web server mode to hg that exports the current repo for merging and browsing. The default port is 8000.
-
mpm authored
This ought to use package_data but that doesn't exist in Python 2.3. So we do a hack of install_data and use glob. This also adds templatepath() to hgweb.py which finds the templates relative to hgweb.py's location.
-
- May 25, 2005
- May 24, 2005
- May 25, 2005
-
-
mpm authored
-
mpm authored
This eliminates the blame command and makes annotate more flexible.
-
mpm authored
This lets the merge program be slightly more user-friendly
-
mpm authored
These changes make the client keep track of what it's seen more carefully to avoid some redundant requests.
-
mpm authored
The old ancestor algorithm could get fooled into returning ancestors closer to root than it ought to. Hopefully this one, which strictly orders its search by distance from room, will be foolproof.
-
mpm authored
If you merge with a repo that has deleted a file after editing it, hg attempted to resolve the file. This (correctly) resulted in hg verify errors because the resolved version didn't show up in the manifests. This moves the manifest resolution before file resolution and decides which files to resolve based on the (partially) resolved manifest. After files are resolved, the final manifest is committed.
-
mpm authored
-
- May 24, 2005
- May 22, 2005