tests/test-issue-6028.t
author Kyle Lippincott <spectral@google.com>
Mon, 16 Sep 2019 12:44:38 -0700
changeset 4848 535ab2609e45
parent 4843 d6e2820dac1f
permissions -rw-r--r--
cmdstate: introduce a "saver" contextmanager and use it in place of save() Previously, the state was only saved in some paths out of these functions. This can be problematic, if the user ctrl-c's (or `kill -9`'s) the process, or we exit out of `relocate` for anything besides the "expected" reason, we won't record that we were in the middle of an evolve. One of our users has discovered that this leaves hg in a weird state; the user did something like this: ``` $ hg evolve <something goes wrong with the merge tool, hits ctrl-c> <deals with the merge conflicts> $ hg evolve --continue abort: no interrupted evolve to continue $ hg evolve abort: uncommitted changes # Note: commands.status.verbose=True is set. $ hg status M foo # The repository is in an unfinished *update* state. # No unresolved merge conflicts # To continue: hg update ``` The user did an `hg update`, but it didn't actually do anything besides take it out of the unfinished update state (the files were still dirty in the working directory).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4297
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
     1
This test file test the #6028 issue
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
     2
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
     3
evolve fails with mercurial.error.ProgrammingError: unsupported changeid '' of type <type 'str'>
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
     4
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
     5
https://bz.mercurial-scm.org/show_bug.cgi?id=6028
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
     6
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
     7
Global setup
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
     8
============
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
     9
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    10
  $ . $TESTDIR/testlib/common.sh
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    11
  $ cat >> $HGRCPATH <<EOF
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    12
  > [ui]
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    13
  > interactive = true
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    14
  > [phases]
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    15
  > publish=False
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    16
  > [extensions]
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    17
  > evolve =
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    18
  > topic =
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    19
  > EOF
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    20
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    21
Test
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    22
====
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    23
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    24
  $ hg init $TESTTMP/issue-6028
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    25
  $ cd $TESTTMP/issue-6028
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    26
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    27
create initial commit
4843
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
    28
4297
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    29
  $ echo "0" > 0
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    30
  $ hg ci -Am 0
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    31
  adding 0
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    32
4843
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
    33
start new topics "a" and "b" both from 0
4297
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    34
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    35
  $ hg up default
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    36
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    37
  $ hg topics a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    38
  marked working directory as topic: a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    39
  $ echo "a" > a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    40
  $ hg ci -Am a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    41
  adding a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    42
  active topic 'a' grew its first changeset
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    43
  (see 'hg help topics' for more information)
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    44
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    45
  $ hg up default
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    46
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    47
  $ hg topics b
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    48
  marked working directory as topic: b
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    49
  $ echo "b" > b
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    50
  $ hg ci -Am b
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    51
  adding b
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    52
  active topic 'b' grew its first changeset
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    53
  (see 'hg help topics' for more information)
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    54
4843
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
    55
create branch "integration" from 0, merge topics "a" and "b" into it
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
    56
4297
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    57
  $ hg up default
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    58
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    59
  $ hg branch integration
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    60
  marked working directory as branch integration
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    61
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    62
  $ hg merge a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    63
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    64
  (branch merge, don't forget to commit)
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    65
  $ hg ci -m "merged a"
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    66
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    67
  $ hg merge b
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    68
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    69
  (branch merge, don't forget to commit)
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    70
  $ hg ci -m "merged b"
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    71
4843
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
    72
commit a bad file on topic "a", merge it into "integration"
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
    73
4297
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    74
  $ hg up a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    75
  switching to topic a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    76
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    77
  $ echo "a bad commit" >> a_bad_commit
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    78
  $ hg add a_bad_commit
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    79
  $ hg ci -m "a bad commit"
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    80
  $ hg up integration
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    81
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    82
  $ hg merge a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    83
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    84
  (branch merge, don't forget to commit)
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    85
  $ hg ci -m "merged a bad commit"
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    86
4843
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
    87
add more commits on both topics and merge them into "integration"
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
    88
4297
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    89
  $ hg up a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    90
  switching to topic a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    91
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    92
  $ echo "aa" >> a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    93
  $ hg ci -m "aa"
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    94
  $ hg up integration
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    95
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    96
  $ hg merge a
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    97
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    98
  (branch merge, don't forget to commit)
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
    99
  $ hg ci -m "merged aa"
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   100
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   101
  $ hg up b
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   102
  switching to topic b
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   103
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   104
  $ echo "bb" >> b
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   105
  $ hg ci -m "bb"
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   106
  $ hg up integration
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   107
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   108
  $ hg merge b
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   109
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   110
  (branch merge, don't forget to commit)
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   111
  $ hg ci -m "merged bb"
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   112
4843
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   113
create instability by pruning two changesets, one in a topic, one a merge
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   114
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   115
  $ hg log -r 5:6 -T '{rev}: {desc}\n'
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   116
  5: a bad commit
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   117
  6: merged a bad commit
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   118
4297
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   119
  $ hg prune -r 5:6
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   120
  2 changesets pruned
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   121
  3 new orphan changesets
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   122
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   123
  $ hg up 4
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   124
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   125
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   126
start the evolve
4843
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   127
4578
75e76141cba2 tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   128
  $ hg evolve --update --no-all
4297
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   129
  move:[8] merged aa
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   130
  atop:[4] merged b
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   131
  working directory is now at c920dd828523
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   132
4843
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   133
casually checking issue6141: position of p2 is not changed
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   134
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   135
  $ hg log -r 'predecessors(.) + .'
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   136
  changeset:   8:3f6f25057afb
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   137
  branch:      integration
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   138
  parent:      6:cfc4c333724f
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   139
  parent:      7:61eff7f7bb6c
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   140
  user:        test
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   141
  date:        Thu Jan 01 00:00:00 1970 +0000
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   142
  obsolete:    rebased using evolve as 11:c920dd828523
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   143
  summary:     merged aa
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   144
  
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   145
  changeset:   11:c920dd828523
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   146
  branch:      integration
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   147
  tag:         tip
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   148
  parent:      4:e33aee2c715e
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   149
  parent:      7:61eff7f7bb6c
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   150
  user:        test
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   151
  date:        Thu Jan 01 00:00:00 1970 +0000
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   152
  instability: orphan
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   153
  summary:     merged aa
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   154
  
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   155
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   156
test that we successfully got rid of the bad file
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   157
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   158
  $ hg d --git -r 'predecessors(.)' -r '.'
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   159
  diff --git a/a_bad_commit b/a_bad_commit
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   160
  deleted file mode 100644
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   161
  --- a/a_bad_commit
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   162
  +++ /dev/null
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   163
  @@ -1,1 +0,0 @@
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   164
  -a bad commit
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   165
4297
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   166
evolve creates an obsolete changeset above as 11
4843
d6e2820dac1f tests: add some more actions to test-issue-6028, describe what's being done
Anton Shestakov <av6@dwimlabs.net>
parents: 4578
diff changeset
   167
4297
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   168
  $ hg evolve -r .
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   169
  cannot solve instability of c920dd828523, skipping
699e25687cc5 issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
James Reynolds <james.glenn.reynolds@gmail.com>
parents:
diff changeset
   170
  cannot solve instability of c920dd828523, skipping