tests/test-revlog-group-emptyiter.t
author Matt Harbison <matt_harbison@yahoo.com>
Mon, 20 Aug 2018 16:19:36 -0400
changeset 39224 5e52b6da9c0c
parent 16913 f2719b387380
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:
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12328
diff changeset
     1
Issue1678: IndexError when pushing
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 11918
diff changeset
     2
11918
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
     3
setting up base repo
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
     4
  $ hg init a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
     5
  $ cd a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
     6
  $ touch a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
     7
  $ hg ci -Am a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
     8
  adding a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
     9
  $ cd ..
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    10
11918
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    11
cloning base repo
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    12
  $ hg clone a b
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    13
  updating to branch default
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    14
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    15
  $ cd b
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    16
11918
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    17
setting up cset to push
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    18
  $ hg up null
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    19
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    20
  $ touch a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    21
different msg so we get a clog new entry
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    22
  $ hg ci -Am b
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    23
  adding a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    24
  created new head
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    25
11918
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    26
pushing
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    27
  $ hg push -f ../a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    28
  pushing to ../a
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    29
  searching for changes
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    30
  adding changesets
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    31
  adding manifests
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    32
  adding file changes
f21ecd091970 tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8635
diff changeset
    33
  added 1 changesets with 0 changes to 0 files (+1 heads)
8635
aaaf4af1c173 revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
    34
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
    35
  $ cd ..