tests/test-commit-copy.t
author Martin Geisler <mg@aragost.com>
Fri, 25 Feb 2011 12:32:15 +0100
branchstable
changeset 13475 c7bef25ca393
parent 11803 b90199179eb5
child 14182 ec5886db9dc6
permissions -rw-r--r--
eol: handle LockUnavailable error (issue2569) If the repository is not locked when clearing the dirstate, then running test-eol.t in a loop fails sooner or later with: ERROR: /home/mg/src/mercurial-crew/tests/test-eol.t output changed --- /home/mg/src/mercurial-crew/tests/test-eol.t +++ /home/mg/src/mercurial-crew/tests/test-eol.t.err @@ -343,6 +343,7 @@ % hg status (eol activated) M win.txt % hg commit + nothing changed % hg status $ testmixed CRLF However, if we cannot lock the repository, then we can also not make a commit and so we can simply ignore a LockUnavailable error.
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
b90199179eb5 unify test-commit-copy
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 3853
diff changeset
    13
  $ hg debugindex .hg/store/data/bar.i
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