Skip to content
Snippets Groups Projects
  1. May 25, 2005
    • mpm's avatar
      Add options to annotate for user/rev/changeset · 8029ee2949b8
      mpm authored
      This eliminates the blame command and makes annotate more flexible.
      8029ee2949b8
    • mpm's avatar
      Pass filename to $HGMERGE · 8cd45e152c83
      mpm authored
      This lets the merge program be slightly more user-friendly
      8cd45e152c83
    • mpm's avatar
      Improve pruning of branches in outstanding changeset algorithm · c32286d0a665
      mpm authored
      These changes make the client keep track of what it's seen more
      carefully to avoid some redundant requests.
      c32286d0a665
    • mpm's avatar
      A new ancestor algorithm · b6d8ed7aeba0
      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.
      b6d8ed7aeba0
    • mpm's avatar
      Handle merge with deletions · 4a828422247d
      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.
      4a828422247d
    • mpm's avatar
      Minor fixes to verify · fbce9fc531d2
      mpm authored
      fbce9fc531d2
  2. May 24, 2005
  3. May 22, 2005
  4. May 21, 2005
  5. May 22, 2005
  6. May 21, 2005
Loading