Skip to content
Snippets Groups Projects
  1. Oct 23, 2015
    • Gregory Szorc's avatar
      tests: add tests for remote hook output (issue4788) · 00e75baa810f
      Gregory Szorc authored
      The added tests don't agree in their output. This demonstrates a
      difference in `hg push` behavior between pre-bundle2 and bundle2.
      A subsequent patch will attempt to restore some of the pre-bundle2
      behavior to bundle2.
      00e75baa810f
  2. Oct 24, 2015
  3. Oct 23, 2015
  4. Oct 22, 2015
    • Gregory Szorc's avatar
      ui: support paths.default-push without paths.default set (issue4914) · 71d5238f92e9
      Gregory Szorc authored
      This behavior regressed as part of the paths API refactoring. Previous
      behavior was to accept "default-push" without "default" defined. Current
      behavior aborts with "default repository not configured!." This patch
      restores the old behavior and adds test coverage for the scenario, which
      was absent before.
      71d5238f92e9
  5. Oct 21, 2015
  6. Oct 20, 2015
  7. Oct 19, 2015
  8. Oct 15, 2015
  9. Oct 20, 2015
    • Ryan McElroy's avatar
      editmerge: dequote other use of $ED · 612502900a2d
      Ryan McElroy authored
      We want to support editors with parameters, eg EDITOR="vim -O" or whatever.
      So remove the quotes from around $ED and assume that the editor variable is
      properly escaped already.
      612502900a2d
  10. Oct 19, 2015
  11. Oct 03, 2015
  12. Oct 19, 2015
  13. Oct 20, 2015
  14. Oct 15, 2015
    • Siddharth Agarwal's avatar
      commands.resolve: conclude merge driver if no unresolved files are left · e6003ecf3257
      Siddharth Agarwal authored
      This can happen when either 'hg resolve --all' is called or a driver-resolved
      file is explicitly requested.
      
      This is done as part of 'hg resolve --all' so that users still have a chance to
      test their changes before committing them.
      
      The exact semantics here are still to be decided. This does not impact any
      non-experimental features.
      
      Thanks to Pierre-Yves David for some advice about this behavior in particular,
      and merge drivers in general.
      e6003ecf3257
Loading