Skip to content
Snippets Groups Projects
  1. May 04, 2012
  2. May 03, 2012
  3. May 06, 2012
  4. May 04, 2012
  5. May 03, 2012
  6. May 02, 2012
  7. May 03, 2012
  8. May 02, 2012
  9. May 01, 2012
  10. Apr 30, 2012
  11. Apr 29, 2012
  12. Apr 30, 2012
    • Patrick Mézard's avatar
      subrepo/svn: cache _wcrev() value in merge() · 4955e7bf085c
      Patrick Mézard authored
      4955e7bf085c
    • Patrick Mézard's avatar
      subrepo/svn: fix checked out rev number retrieval (issue2968) · ae2664ee0223
      Patrick Mézard authored
      The initial version was to take the "Revision" field from svn info. It works
      but produces false positive when parent paths are being moved or unrelated
      changes are being committed, causing it to change while the svn checkout itself
      remains the same. To avoid spurious commit, we took "Revision" and "Last
      Changed Rev" for general comparison and kept the latter to answer "what is your
      revision?" question. This is better but fails when the subrepo path exists at
      "Revision" but not at "Last Changed Rev". This patch adds a check for this, and
      returns "Revision" if the path does not exist. We try to avoid doing this as
      much as possible at it implies an extra, *remote* call.
      ae2664ee0223
    • Patrick Mézard's avatar
      amend: fix copy records handling (issue3410) · 9224cc2e99cc
      Patrick Mézard authored
      Messing with the dirstate before the intermediate commit seems error prone.
      Instead, commit and recompute the copies with copies.pathcopies(), then use
      that with commitctx().
      
      Since copies.pathcopies() does not support file replacement very well, the
      whole .renamed() condition in samefile() is removed and the "file replacement
      caused by differing copy source" effect is discarded.
      
      Test shamelessly stolen from Idan Kamara <idankk86@gmail.com>
      9224cc2e99cc
    • Patrick Mézard's avatar
      test-commit-amend: exhibit an --amend weirdness · 90ca344a7c55
      Patrick Mézard authored
      The weirdness is --amend let you replace one file with another with same data
      and flags if the new file copy record differ from the one in the parent
      revision. In theory, there is no problem with this kind of thing, subversion
      supports it, but here we see log and status disagree. The reason is log reads
      the copy record from the filelog, while status calls copies.pathcopies() which
      eventually invokes some expensiveness argument to discard this case (copies.py,
      _forwardcopies(), line 132). Since the next patch will side with pathcopies(),
      I prefer to call this behaviour a bug.
      90ca344a7c55
  13. Apr 29, 2012
    • Patrick Mézard's avatar
      localrepo: add setparents() to adjust dirstate copies (issue3407) · ebf6d38c9063
      Patrick Mézard authored
      The fix introduced in eab9119c5dee was only partially successful. It is correct
      to turn dirstate 'm' merge records into normal/dirty ones but copy records are
      lost in the process. To adjust them as well, we need to look in the first
      parent manifest to know which files were added and preserve only related
      records. But the dirstate does not have access to changesets, the logic has to
      moved at another level, in localrepo.
      ebf6d38c9063
    • Patrick Mézard's avatar
      test-rebase-parameters: more tests for revset/opts · 0d494a38c586
      Patrick Mézard authored
      - --source and revset
      - --base and revset
      - --rev and revset
      - --rev and --source combination
      - --rev and --base combination
      0d494a38c586
  14. Apr 30, 2012
  15. Apr 28, 2012
  16. Apr 27, 2012
Loading