tests/test-evolve-orphan-corner-cases.t
author Martin von Zweigbergk <martinvonz@google.com>
Mon, 04 Nov 2019 14:31:08 -0800
changeset 4917 d1d8e97d32af
parent 4660 b62ed7c69561
child 4675 79bc0f1a832e
permissions -rw-r--r--
obslog: make changeset available to templater obslog templating currently has very limited support for templating the precursor changeset (when available). The only available keywords are {node}, {rev}, and {shortdescription}. This patch makes the entire changeset available to the templater by passing it to formatter.context(). That function has been available since Mercurial 4.2.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4587
90cc85a82be7 test: move a test to an appropriate test file
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4586
diff changeset
     1
=======================================================
90cc85a82be7 test: move a test to an appropriate test file
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4586
diff changeset
     2
Tests the resolution of orphan changesets: corner cases
90cc85a82be7 test: move a test to an appropriate test file
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4586
diff changeset
     3
=======================================================
90cc85a82be7 test: move a test to an appropriate test file
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4586
diff changeset
     4
90cc85a82be7 test: move a test to an appropriate test file
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4586
diff changeset
     5
Setup
90cc85a82be7 test: move a test to an appropriate test file
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4586
diff changeset
     6
=====
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     7
  $ cat >> $HGRCPATH <<EOF
4587
90cc85a82be7 test: move a test to an appropriate test file
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4586
diff changeset
     8
  > [alias]
90cc85a82be7 test: move a test to an appropriate test file
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4586
diff changeset
     9
  > glog = log -GT "{rev}:{node|short} {desc|firstline}\n {phase} {troubles}\n\n"
113
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
    10
  > [phases]
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
    11
  > publish = False
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    12
  > [extensions]
4587
90cc85a82be7 test: move a test to an appropriate test file
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4586
diff changeset
    13
  > rebase =
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    14
  > EOF
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1785
diff changeset
    15
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
1358
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    16
296
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents: 269
diff changeset
    17
  $ glog() {
2776
4dd84054ebbb test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2767
diff changeset
    18
  >   hg log -G --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@"
296
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents: 269
diff changeset
    19
  > }
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents: 269
diff changeset
    20
4586
1b91a518d10c test: improve the title of a test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4585
diff changeset
    21
Test to make sure that `lastsolved` always has correct value and things don't break:
1b91a518d10c test: improve the title of a test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4585
diff changeset
    22
------------------------------------------------------------------------------------
1b91a518d10c test: improve the title of a test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4585
diff changeset
    23
(before we were not updating it in case of orphan merge)
4343
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    24
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    25
Prepare the repo:
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    26
  $ hg init orphanmergerepo
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    27
  $ cd orphanmergerepo
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    28
  $ for fn in a b c; do echo foo > $fn; hg ci -Am "added "$fn; done;
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    29
  adding a
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    30
  adding b
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    31
  adding c
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
    32
Let's create a merge commit so that we can create orphan merge later:
4343
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    33
  $ hg up 1 -q
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    34
  $ echo feature > f
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    35
  $ hg ci -Am "added feature f"
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    36
  adding f
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    37
  created new head
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    38
  $ hg merge
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    39
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    40
  (branch merge, don't forget to commit)
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    41
  $ hg ci -m "merge feature branch"
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    42
  $ glog
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    43
  @    4:2c0a98d38026@default(draft) merge feature branch
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    44
  |\
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    45
  | o  3:4c33e511041e@default(draft) added feature f
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    46
  | |
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    47
  o |  2:8be98ac1a569@default(draft) added c
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    48
  |/
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    49
  o  1:80e6d2c47cfe@default(draft) added b
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    50
  |
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    51
  o  0:f7ad41964313@default(draft) added a
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    52
  
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    53
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    54
Now make the parents of merge commit obsolete to get a orphan merge:
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    55
  $ hg up 2 -q
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    56
  $ echo "fixit" > c
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    57
  $ hg ci --amend -m "updated c"
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    58
  1 new orphan changesets
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    59
  $ hg up 3 -q
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    60
  $ echo "fixit" > c
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    61
  $ hg ci --amend -m "updated f"
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    62
  $ glog
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    63
  @  6:086d9bedcd75@default(draft) updated f
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    64
  |
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    65
  | o  5:f84f2c548fbc@default(draft) updated c
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    66
  |/
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    67
  | *    4:2c0a98d38026@default(draft) merge feature branch
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    68
  | |\
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    69
  +---x  3:4c33e511041e@default(draft) added feature f
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    70
  | |
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    71
  | x  2:8be98ac1a569@default(draft) added c
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    72
  |/
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    73
  o  1:80e6d2c47cfe@default(draft) added b
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    74
  |
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    75
  o  0:f7ad41964313@default(draft) added a
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    76
  
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    77
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    78
To check `lastsolved` contain right value after completion of orphan-merge
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
    79
resolution there should be one more instability to be evolved; lets create one:
4343
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    80
  $ hg up 1 -q
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    81
  $ echo d > d
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    82
  $ hg ci -Am "added d"
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    83
  adding c
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    84
  adding d
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    85
  created new head
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    86
  $ echo e > e
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    87
  $ hg ci -Am "added e"
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    88
  adding e
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    89
  $ hg up .^
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    90
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    91
  $ echo "updated d" >> d
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    92
  $ hg ci --amend -m "updated d"
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    93
  1 new orphan changesets
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    94
  $ glog
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    95
  @  9:7c4d1834c346@default(draft) updated d
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    96
  |
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    97
  | *  8:421f7614462a@default(draft) added e
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    98
  | |
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
    99
  | x  7:afe5acea1990@default(draft) added d
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   100
  |/
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   101
  | o  6:086d9bedcd75@default(draft) updated f
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   102
  |/
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   103
  | o  5:f84f2c548fbc@default(draft) updated c
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   104
  |/
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   105
  | *    4:2c0a98d38026@default(draft) merge feature branch
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   106
  | |\
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   107
  +---x  3:4c33e511041e@default(draft) added feature f
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   108
  | |
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   109
  | x  2:8be98ac1a569@default(draft) added c
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   110
  |/
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   111
  o  1:80e6d2c47cfe@default(draft) added b
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   112
  |
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   113
  o  0:f7ad41964313@default(draft) added a
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   114
  
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   115
Now we have one orphan merge and one more orphan cset that we just created.
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   116
Lets evolve:
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   117
  $ hg evolve --all --any
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   118
  move:[4] merge feature branch
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   119
  atop:[5] updated c
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   120
  move:[10] merge feature branch
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   121
  atop:[6] updated f
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
   122
  move:[8] added e
4344
e5282131a78d evolve: cover the orphanmerge part missed by lastsolved
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4343
diff changeset
   123
  atop:[9] updated d