Skip to content
Snippets Groups Projects
  1. Feb 10, 2011
    • Gilles Moris's avatar
      rollback: clarifies the message about the reverted state (issue2628) · 1e497df514e2
      Gilles Moris authored
      Previously, when rolling back a transaction, some users could be confused
      between the level to which the store is rolled back, and the new parents
      of the working directory.
      
        $ hg rollback
        rolling back to revision 4 (undo commit)
      
      With this change:
        $ hg rollback
        repository tip rolled back to tip revision 4 (undo commit)
        working directory now based on revision 2 and 1
      
      So now the user can realize that the store has been rolled back to an older
      tip, but also that the working directory may not on the tip (here we are
      rolling back the merge of the heads 2 and 1)
      1e497df514e2
  2. Feb 20, 2011
  3. Feb 18, 2011
  4. Feb 16, 2011
  5. Feb 17, 2011
  6. Feb 16, 2011
  7. Feb 17, 2011
  8. Feb 16, 2011
  9. Feb 09, 2011
    • Erik Zielke's avatar
      subrepos: prompt on conflicts on update with dirty subrepos · 0748e18be470
      Erik Zielke authored
      Consider a repository with a single subrepository. The changesets in
      the main repository reference the subrepository changesets like this:
      
        m0 -> s0
        m1 -> s1
        m2 -> s2
      
      Starting from a state (m1, s0), doing 'hg update m2' in the main
      repository will yield a conflict: the subrepo is at revision s0 but
      the target revision says it should be at revision s2.
      
      Before this change, Mercurial would do (m1, s0) -> (m2, s2) and thus
      ignore the conflict between the working copy and the target revision.
      
      With this change, the user is prompted to resolve the conflict by
      choosing which revision he wants. This is consistent with 'hg merge',
      which also prompts the user when it detects conflicts in the merged
      .hgsubstate files.
      
      The prompt looks like this:
      
        $ hg update tip
         subrepository sources for my-subrepo differ
        use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?
      0748e18be470
  10. Feb 16, 2011
  11. Feb 09, 2011
  12. Feb 03, 2011
  13. Feb 15, 2011
    • Patrick Mezard's avatar
      commit: abort if a subrepo is modified and ui.commitsubrepos=no · d4de90a612f7
      Patrick Mezard authored
      The default behaviour is to commit subrepositories with uncommitted changes. In
      my experience this is usually undesirable:
      
      - Changes to dependencies are often debugging leftovers
      - Real changes should generally be applied on the source project directly,
        tested then committed. This is not always possible, subversion subrepos may
        include only a small part of the source project, without the tests.
      
      Setting ui.commitsubrepos=no will now abort commits containing such modified
      subrepositories like:
      
        $ hg --config ui.commitsubrepos=no ci -m msg
        abort: uncommitted changes in subrepo sub
      
      I ruled out the hook solution because it does not easily take --include/exclude
      options in account. Also, my main concern is whether this flag could cause
      problems with extensions. If there are legitimate reasons for callers to
      override this behaviour (I could not find any), they might either override at ui
      level, or we could add an argument to localrepo.commit() later.
      
      v2:
      - Renamed ui.commitsubs to ui.commitsubrepos
      - Mention the configuration entry in hg help subrepos
      d4de90a612f7
    • Matt Mackall's avatar
      tests: fixes for svn 1.4.2 · 1f2b2c33d386
      Matt Mackall authored
      1f2b2c33d386
    • André Sintzoff's avatar
      mq: remove undo after a qimport · 9e5df8719ad4
      André Sintzoff authored
      9e5df8719ad4
    • Adrian Buehlmann's avatar
      transaction: use posixfile and unlink from util · 19ad316e5be3
      Adrian Buehlmann authored
      instead of open() and os.unlink()
      
      Avoids potential issues with file access on Windows (e.g. AV-scanners).
      19ad316e5be3
    • Kevin Bullock's avatar
      bookmarks: update help text since moving into core · 354f304152ad
      Kevin Bullock authored
      Clarifies the help text for the bookmarks command regarding the
      requirements for pushing or pulling bookmarks.
      354f304152ad
Loading