tests/test-commit-copy.t
author Patrick Mezard <patrick@mezard.eu>
Mon, 30 Apr 2012 17:03:15 +0200
branchstable
changeset 16554 ae2664ee0223
parent 14182 ec5886db9dc6
permissions -rw-r--r--
subrepo/svn: fix checked out rev number retrieval (issue2968) 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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11803
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
     1
  $ hg init dir
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
     2
  $ cd dir
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
     3
  $ echo bleh > bar
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
     4
  $ hg add bar
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
     5
  $ hg ci -m 'add bar'
3675
6990e499d71a Revert almost all of 5be434785317; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     6
11803
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
     7
  $ hg cp bar foo
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
     8
  $ echo >> bar
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
     9
  $ hg ci -m 'cp bar foo; change bar'
3675
6990e499d71a Revert almost all of 5be434785317; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    10
11803
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
    11
  $ hg debugrename foo
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
    12
  foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 11803
diff changeset
    13
  $ hg debugindex bar
11803
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
    14
     rev    offset  length   base linkrev nodeid       p1           p2
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
    15
       0         0       6      0       0 26d3ca0dfd18 000000000000 000000000000
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
    16
       1         6       7      1       1 d267bddd54f7 26d3ca0dfd18 000000000000