tests/test-revert-flags.t
author Matt Harbison <matt_harbison@yahoo.com>
Mon, 20 Aug 2018 16:19:36 -0400
changeset 39224 5e52b6da9c0c
parent 22046 7a9cbb315d84
permissions -rw-r--r--
tests: demonstrate a problem with renames on the p2 side of a conversion I think this is related to the octopus merge being sloppy, and that's having a cascading affect on the fixup merge. If this change is made on p1 (specifically with the 'Added parent file' commit), the failure doesn't occur. The file modification with the rename doesn't seem to be necessary, but it's what's happening in a production repo where I first noticed, so I left it. This is an example of the manifest divergence I'd been seeing, which wasn't fixed by Yuya's recent changes. This is separate from the changelog divergence I was also seeing[1]. Probably nobody cares about bzr anymore, but this will also affect git, since the octopus fixup code is in the hg sink. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-August/120473.html
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 16913
diff changeset
     1
#require execbit
6030
d0dbae32517c revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     2
12110
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     3
  $ hg init repo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     4
  $ cd repo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     5
  $ echo foo > foo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     6
  $ chmod 644 foo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     7
  $ hg ci -qAm '644'
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     8
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
     9
  $ chmod 755 foo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    10
  $ hg ci -qAm '755'
6030
d0dbae32517c revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    11
12110
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    12
reverting to rev 0
6030
d0dbae32517c revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    13
12110
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    14
  $ hg revert -a -r 0
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    15
  reverting foo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    16
  $ hg st
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    17
  M foo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    18
  $ hg diff --git
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    19
  diff --git a/foo b/foo
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    20
  old mode 100755
58a8105242a5 tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 6030
diff changeset
    21
  new mode 100644
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12110
diff changeset
    22
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12110
diff changeset
    23
  $ cd ..