[Bug 6107] New: touch can fail to warn about divergence

[mercurial-bugs at mercurial-scm.org]

https://bz.mercurial-scm.org/show_bug.cgi?id=6107

            Bug ID: 6107
           Summary: touch can fail to warn about divergence
           Product: Mercurial
           Version: 4.8
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: evolution
          Assignee: bugzilla at mercurial-scm.org
          Reporter: martinvonz at google.com
                CC: mercurial-devel at mercurial-scm.org,
                    pierre-yves.david at ens-lyon.org

One of our users reported a case like this:


  $ cat >> $HGRCPATH <<EOF
  > [extensions]
  > evolve =
  > EOF

  $ hg init repo
  $ cd repo
  $ echo a > a1
  $ echo a > a2
  $ echo a > a3
  $ echo a > a4
  $ hg ci -Aqm as
  $ for f in a1 a2 a3 a4; do
  >   hg co -q null
  >   echo a > $f
  >   hg ci -Aqm $f
  $ done
  $ hg prune -q -r 0 --succ 1:4 --split
  $ hg touch 1
  $ hg touch 2
  $ hg touch 3
  $ hg touch 4
  $ hg prune -q tip
  $ hg touch 4 --hidden
  $ hg touch 8 --hidden
  5 new content-divergent changesets


I initially thought the split was necessary, but we can reduce it further to
something as simple as this:


  $ cat >> $HGRCPATH <<EOF
  > [extensions]
  > evolve =
  > EOF

  $ hg init repo
  $ cd repo
  $ echo a > a
  $ hg ci -Aqm a
  $ hg touch 0
  $ hg prune -q tip
  $ hg touch 0 --hidden
  $ hg touch 1 --hidden
  2 new content-divergent changesets

-- 
You are receiving this mail because:
You are on the CC list for the bug.