Skip to content
Snippets Groups Projects
  1. Mar 01, 2013
  2. Feb 28, 2013
  3. Feb 17, 2013
    • Katsunori FUJIWARA's avatar
      bundle: treat branches created newly on the local correctly (issue3828) · 61c8327c
      Katsunori FUJIWARA authored
      Before this patch, "hg bundle --branch foo other" fails to create
      bundle file, if specified "foo" branch is created newly on the local
      repository.
      
      "hg bundle" uses "hg.addbranchrevs(repo, other, ...)" to look branch
      names up, even though other outgoing-like implementation uses
      "hg.addbranchrevs(repo, repo, ...)". In the former invocation, "other"
      repository recognizes such branches as unknown, so execution is
      aborted.
      
      This patch uses "hg.addbranchrevs(repo, repo, ..)" in "hg bundle" to
      bundle revisions on such branches correctly.
      61c8327c
  4. Feb 15, 2013
    • Kevin Bullock's avatar
      mergetools: refine vimdiff warning message · 7d66a44e
      Kevin Bullock authored
      We explicitly redraw before echoing the message so that it simply
      displays at the bottom of the window. Also simplifies the message
      printing by using 'echomsg' (which uses 'echohl' internally) and adds
      the names of the software involved for improved Googleability.
      7d66a44e
    • Pierre-Yves David's avatar
      mergetools: vimdiff issue a warning explaining how to abort · f2b1f78c
      Pierre-Yves David authored
      Adds a message displayed at each vimdiff invocation:
      
        merge conflict detected, type ":cq" to abort
      
      Vimdiff is very confusing for non-vim user (not to speak about vim user confused
      anyway. However it is very likely that vimdiff is picked as the mergetool of
      choice when using the default config:
      - vim is available on all UNIX system.
      - Its one of the rare non graphical merge tools.
      f2b1f78c
  5. Feb 13, 2013
  6. Feb 09, 2013
  7. Feb 08, 2013
  8. Feb 05, 2013
  9. Feb 06, 2013
    • Pierre-Yves David's avatar
      incoming: fix incoming when a local head is remotely filtered (issue3805) · cd403d6d
      Pierre-Yves David authored
      In its current state discovery may return (remotely) filtered elements
      in "common". This has usually no impact as "missing" is kept clear of
      filtered elements. However when the "remote" repo is a local repo (disk
      accessible, and directly created in memory) the incoming code takes a
      shortcut and directly uses the "remote" repo to generate the incoming
      output. When some common elements are filtered this led to a crash. We
      now ensure we use an unfiltered repository to generate the incoming
      output. This does not change the behavior as missing is clear of
      filtered revision.
      
      Now that we have proper low level filtering, incoming code needs a
      deeper cleanup but it is already planned.
      cd403d6d
  10. Feb 05, 2013
  11. Feb 04, 2013
  12. Feb 03, 2013
  13. Feb 01, 2013
  14. Jan 31, 2013
  15. Feb 01, 2013
Loading