Skip to content
Snippets Groups Projects
  1. Jul 14, 2013
  2. Jul 12, 2013
  3. Jul 11, 2013
    • Jordi Gutiérrez Hermoso's avatar
      commit: enable --secret option · 4a0d0616
      Jordi Gutiérrez Hermoso authored
      At the moment, creating secret commits is slightly cumbersome. They
      can either be created by changing the default commit phase to secret
      or by doing `hg phase --secret --force`. Both of these make secret
      commits appear to be like some kind of advanced feature.
      
      Secret commits, however, should be a convenient feature for people who
      want to work on a private branch without affecting anyone else. There
      should therefore be a prominent and convenient method for creating
      secret commits.
      
      Since the default phase is draft and there is no need to use --force
      to go from a secret phase to any other phase, this patch
      intentionally does not add --draft and --public options.
      4a0d0616
  4. Jul 17, 2013
    • Florence Laguzet's avatar
      merge: deprecate the --force option · f4148c36
      Florence Laguzet authored
      The --force option in merge does not make what people think it does so
      it may not be visible to everyone.
      
      I have local changes and want to pull one's changes which made 2 heads.
      The --force option in help says
      
       -f --force      force a merge with outstanding changes
      
      so I can expect that I can use it to force the merge and commit it in my
      local repository without taking my local changes into account. But
      merging with -f keeps local changes and "add" them: they must be
      committed or reverted before doing the merge commit. The merge -f cannot
      be reverted so it leads my repository in a bad state: cannot commit
      merge and don't want to revert/commit local changes yet.
      
      Message in help have been updated to emphasize the fact that local
      changes are included in the merge.
      f4148c36
  5. Jul 18, 2013
  6. Jul 11, 2013
  7. Jul 18, 2013
  8. Jul 12, 2013
  9. Jul 08, 2013
  10. Jul 12, 2013
  11. Jul 03, 2013
  12. Jul 15, 2013
  13. Jul 17, 2013
  14. Jul 13, 2013
  15. Jul 14, 2013
  16. Jul 13, 2013
  17. Jul 17, 2013
  18. Jul 14, 2013
  19. Jul 16, 2013
Loading