Skip to content
Snippets Groups Projects
  1. Mar 12, 2011
  2. Mar 10, 2011
  3. Mar 09, 2011
  4. Mar 08, 2011
  5. Mar 07, 2011
  6. Mar 06, 2011
  7. Mar 07, 2011
  8. Mar 06, 2011
  9. Mar 07, 2011
    • Matt Mackall's avatar
      merge: back out single-parent fast-forward merge · 1792b8a9
      Matt Mackall authored
      This backs out
      
       changeset:   13158:9e7e24052745
       user:        Mads Kiilerich <mads@kiilerich.com>
       date:        Tue Dec 07 03:29:21 2010 +0100
       summary:     merge: fast-forward merge with descendant
      
      Before named branches, the invariants were:
      
      a) "merges" always have two parents
      b) p1 is not linearly related to p2
      
      Adding named branches made (b) problematic, so the above patch was
      introduced, which fixed (b) but broke (a).
      
      After discussion, we decided that the invariants should be:
      
      a) "merges" always have two parents
      b) p1 is not linearly related to p2 OR p1 and p2 are on different branches
      1792b8a9
  10. Mar 05, 2011
  11. Mar 06, 2011
  12. Mar 05, 2011
  13. Mar 04, 2011
    • Patrick Mezard's avatar
      subrepo: handle svn tracked/unknown directory collisions · 67fbe566
      Patrick Mezard authored
      This happens more often than expected. Say you have an svn subrepository with
      python code. Python would have generated unknown .pyc files. Now, you rebase
      this setup on a revision where a directory containing python code does not
      exist. Subversion is first asked to remove this directory when updating, but
      will not because it contains untracked items. Then it will have to bring back
      the directory after the merge but will fail because it now collides with an
      untracked directory.
      
      Using --force is not very elegant but it is much simpler than rewriting our own
      purge command for subversion.
      67fbe566
  14. Mar 03, 2011
  15. Mar 02, 2011
  16. Mar 01, 2011
  17. Feb 28, 2011
  18. Feb 11, 2011
  19. Feb 23, 2011
  20. Feb 28, 2011
    • Martin Geisler's avatar
      eol: do not abort on parse error · 9b617c56
      Martin Geisler authored
      Handle parse errors in the .hgeol similarly to how parse errors in the
      .hgtags file are handled: by issuing a warning. This allows the user
      to revert the file using 'hg revert' or 'hg update -C'.
      9b617c56
Loading