Skip to content
Snippets Groups Projects
  1. Apr 22, 2012
  2. Apr 23, 2012
  3. Apr 21, 2012
  4. Apr 23, 2012
  5. Apr 22, 2012
  6. Apr 18, 2012
  7. Apr 15, 2012
    • Katsunori FUJIWARA's avatar
      icasefs: make case-folding collision detection as rename aware (issue3370) · cbf2ea2f
      Katsunori FUJIWARA authored
      if the file in target context causes case-folding collision against
      one in working context, current implementation aborts merging with it,
      even thouhg collding one (in target) is the file renamed from collided
      one (in working).
      
      this patch uses file copy information to know whether colliding file
      is renamed from collided one or not: if so, collision between them is
      ignored.
      
      this patch also avoids collision detection between current context and
      target context, if working context is clean (with --check/-c) or will
      be clean (with --clean/-C).
      cbf2ea2f
  8. Apr 20, 2012
  9. Apr 19, 2012
  10. Apr 18, 2012
  11. Apr 17, 2012
    • Matt Mackall's avatar
      baa06fb6
    • Idan Kamara's avatar
      commit: add option to amend the working dir parent · 55982f62
      Idan Kamara authored
      The --amend flag can be used to amend the parent of the working directory
      with a new commit that contains the changes in the parent in addition to
      those currently reported by "hg status", if there are any. The old commit
      is stored in a backup bundle in ".hg/strip-backup"(see "hg help bundle"
      and "hg help unbundle" on how to restore it).
      
      Message, user and date are taken from the amended commit unless specified.
      When a message isn't specified on the command line, the editor will open
      with the message of the amended commit.
      
      It is not possible to amend public changesets (see "hg help phases") or
      changesets that have children.
      
      Behind the scenes, first commit the update (if there is one) as a regular
      child of the current parent. Then create a new commit on the parent's
      parent with the updated contents. Then change the working copy parent
      to this new combined changeset. Finally, strip the amended commit and
      update commit created in the beginning.
      
      An alternative (cleaner?) approach of doing this is suggested here:
      http://selenic.com/pipermail/mercurial-devel/2012-March/038540.html
      
      It is currently not possible to amend merge commits or recursively,
      this can be added at a later time.
      55982f62
    • Steven Stallion's avatar
      transplant: remove extraneous whitespace · 91196ebc
      Steven Stallion authored
      91196ebc
Loading