tests/test-evolve-content-divergent-interrupted.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Tue, 23 Apr 2019 12:28:32 +0200
branchmercurial-4.4
changeset 4553 aafd51f145ea
parent 4516 f54bb6eaf5e6
child 4675 79bc0f1a832e
permissions -rw-r--r--
test-compat: adapt test output to 4.4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
     1
=======================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
     2
Tests the resolution of content divergence: interrupted
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
     3
=======================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
     4
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
     5
This file intend to cover case where evolve has to be interrupted.
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
     6
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
     7
This test aims at gather test case for --abort, --continue and --stop
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
     8
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
     9
3773
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    10
Tests for the --abort flag for `hg evolve` command while content-divergence resolution
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    11
======================================================================================
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    12
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
    13
The `--abort` flag aborts the interrupted evolve by undoing all the work which
3773
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    14
was done during resolution i.e. stripping new changesets created, moving
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    15
bookmarks back, moving working directory back.
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    16
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    17
This test contains cases when `hg evolve` is doing content-divergence resolution.
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    18
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    19
Setup
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    20
=====
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    21
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    22
  $ cat >> $HGRCPATH <<EOF
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    23
  > [phases]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    24
  > publish = False
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    25
  > [alias]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    26
  > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    27
  > [extensions]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    28
  > EOF
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    29
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    30
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    31
  $ hg init abortrepo
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    32
  $ cd abortrepo
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    33
  $ echo ".*\.orig" > .hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    34
  $ hg add .hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    35
  $ hg ci -m "added hgignore"
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    36
  $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    37
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    38
  $ hg glog
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    39
  @  4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    40
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    41
  o  3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    42
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    43
  o  2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    44
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    45
  o  1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    46
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    47
  o  0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    48
      () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    49
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    50
Creating content divergence, resolution of which will lead to conflicts
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    51
-----------------------------------------------------------------------
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    52
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    53
  $ echo bar > d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    54
  $ hg amend
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    55
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    56
  $ hg up c41c793e0ef1 --hidden
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    57
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    58
  working directory parent is obsolete! (c41c793e0ef1)
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    59
  (use 'hg evolve' to update to its successor: e49523854bc8)
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    60
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    61
  $ echo foobar > d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    62
  $ hg amend
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    63
  $ hg glog --hidden
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    64
  @  6:9c1631e352d9 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    65
  |   () draft
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
    66
  | o  5:e49523854bc8 added d
3773
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    67
  |/    () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    68
  | x  4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    69
  |/    () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    70
  o  3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    71
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    72
  o  2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    73
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    74
  o  1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    75
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    76
  o  0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    77
      () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    78
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    79
  $ hg evolve --content-divergent
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    80
  merge:[6] added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    81
  with: [5] added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    82
  base: [4] added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    83
  merging "other" content-divergent changeset 'e49523854bc8'
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    84
  merging d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    85
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    86
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
    87
  fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
    88
  [1]
3773
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    89
3839
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    90
  $ hg status -v
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    91
  M d
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    92
  # The repository is in an unfinished *evolve* state.
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    93
  
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    94
  # Unresolved merge conflicts:
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    95
  # 
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    96
  #     d
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    97
  # 
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    98
  # To mark files as resolved:  hg resolve --mark FILE
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    99
  
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   100
  # To continue:    hg evolve --continue
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   101
  # To abort:       hg evolve --abort
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   102
  # To stop:        hg evolve --stop
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   103
  # (also see `hg help evolve.interrupted`)
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   104
  
3976
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   105
  $ hg parents
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   106
  changeset:   6:9c1631e352d9
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   107
  tag:         tip
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   108
  parent:      3:ca1b80f7960a
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   109
  user:        test
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   110
  date:        Thu Jan 01 00:00:00 1970 +0000
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   111
  instability: content-divergent
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   112
  summary:     added d
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   113
  
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   114
  changeset:   5:e49523854bc8
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   115
  parent:      3:ca1b80f7960a
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   116
  user:        test
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   117
  date:        Thu Jan 01 00:00:00 1970 +0000
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   118
  instability: content-divergent
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   119
  summary:     added d
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   120
  
3839
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   121
3773
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   122
  $ hg evolve --abort
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   123
  evolve aborted
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   124
  working directory is now at 9c1631e352d9
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   125
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   126
  $ hg glog --hidden
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   127
  @  6:9c1631e352d9 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   128
  |   () draft
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
   129
  | o  5:e49523854bc8 added d
3773
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   130
  |/    () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   131
  | x  4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   132
  |/    () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   133
  o  3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   134
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   135
  o  2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   136
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   137
  o  1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   138
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   139
  o  0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   140
      () draft
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   141
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   142
Creating multiple content-divergence where resolution of last one results in
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   143
conflicts and resolution of first one resulted in no new commit
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   144
-----------------------------------------------------------------------------
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   145
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   146
  $ echo watbar > d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   147
  $ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   148
  $ hg up .^
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   149
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   150
  $ echo bar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   151
  $ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   152
  $ hg up ca1b80f7960a --hidden
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   153
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   154
  working directory parent is obsolete! (ca1b80f7960a)
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   155
  (use 'hg evolve' to update to its successor: 2ba73e31f264)
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   156
  $ echo foobar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   157
  $ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   158
  $ echo bar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   159
  $ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   160
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   161
  $ hg glog --hidden
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   162
  @  10:491e10505bae added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   163
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   164
  | x  9:7398f702a162 added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   165
  |/    () draft
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
   166
  | o  8:2ba73e31f264 added c
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   167
  |/    () draft
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
   168
  | o  7:f0f1694f123e added d
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   169
  | |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   170
  | | x  6:9c1631e352d9 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   171
  | |/    () draft
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
   172
  | | o  5:e49523854bc8 added d
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   173
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   174
  | | x  4:c41c793e0ef1 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   175
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   176
  | x  3:ca1b80f7960a added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   177
  |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   178
  o  2:b1661037fa25 added b
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   179
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   180
  o  1:c7586e2a9264 added a
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   181
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   182
  o  0:8fa14d15e168 added hgignore
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   183
      () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   184
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   185
  $ hg evolve --all --content-divergent
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   186
  merge:[8] added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   187
  with: [10] added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   188
  base: [3] added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   189
  updating to "local" side of the conflict: 2ba73e31f264
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   190
  merging "other" content-divergent changeset '491e10505bae'
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   191
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   192
  merge:[5] added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   193
  with: [7] added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   194
  base: [4] added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   195
  updating to "local" side of the conflict: e49523854bc8
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   196
  merging "other" content-divergent changeset 'f0f1694f123e'
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   197
  merging d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   198
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   199
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   200
  fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   201
  [1]
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   202
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   203
  $ hg evolve --abort
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   204
  evolve aborted
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   205
  working directory is now at 491e10505bae
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   206
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   207
  $ hg glog --hidden
3792
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   208
  @  10:491e10505bae added c
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   209
  |   () draft
3792
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   210
  | x  9:7398f702a162 added c
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   211
  |/    () draft
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
   212
  | o  8:2ba73e31f264 added c
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   213
  |/    () draft
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
   214
  | o  7:f0f1694f123e added d
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   215
  | |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   216
  | | x  6:9c1631e352d9 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   217
  | |/    () draft
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
   218
  | | o  5:e49523854bc8 added d
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   219
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   220
  | | x  4:c41c793e0ef1 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   221
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   222
  | x  3:ca1b80f7960a added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   223
  |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   224
  o  2:b1661037fa25 added b
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   225
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   226
  o  1:c7586e2a9264 added a
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   227
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   228
  o  0:8fa14d15e168 added hgignore
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   229
      () draft
3792
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   230
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   231
  $ hg obslog -r . --all
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
   232
  o  2ba73e31f264 (8) added c
3832
fb821ed44f86 evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3792
diff changeset
   233
  |
fb821ed44f86 evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3792
diff changeset
   234
  | @  491e10505bae (10) added c
3792
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   235
  | |
3832
fb821ed44f86 evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3792
diff changeset
   236
  | x  7398f702a162 (9) added c
3792
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   237
  |/     rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000)
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   238
  |
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   239
  x  ca1b80f7960a (3) added c
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   240
       rewritten(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   241
       rewritten(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   242
  
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   243
  $ cd ..
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   244
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   245
Creating content-divergence on multiple parents when gca of divergent changesets
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   246
is parent of one of the divergents and relocating leads to conflicts
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   247
---------------------------------------------------------------------------------
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   248
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   249
  $ hg init multiparent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   250
  $ cd multiparent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   251
  $ echo ".*\.orig" > .hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   252
  $ hg add .hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   253
  $ hg ci -m "added hgignore"
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   254
  $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   255
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   256
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   257
  @  4:c41c793e0ef1 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   258
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   259
  o  3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   260
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   261
  o  2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   262
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   263
  o  1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   264
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   265
  o  0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   266
      () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   267
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   268
  $ hg rebase -r . -d .^^^ --config extensions.rebase=
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   269
  rebasing 4:c41c793e0ef1 "added d" (tip)
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   270
  $ echo bar > c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   271
  $ hg add c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   272
  $ hg amend
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   273
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   274
  $ hg up --hidden c41c793e0ef1
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   275
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   276
  working directory parent is obsolete! (c41c793e0ef1)
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   277
  (use 'hg evolve' to update to its successor: 69bdd23a9b0d)
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   278
  $ echo bar > d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   279
  $ hg amend
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   280
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   281
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   282
  @  7:e49523854bc8 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   283
  |   () draft
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
   284
  | o  6:69bdd23a9b0d added d
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   285
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   286
  o |  3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   287
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   288
  o |  2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   289
  |/    () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   290
  o  1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   291
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   292
  o  0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   293
      () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   294
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   295
  $ hg evolve --content-divergent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   296
  merge:[7] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   297
  with: [6] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   298
  base: [4] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   299
  rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   300
  merging c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   301
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
3853
796334340cad evolve: make one missed error to align other error messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
   302
  fix conflicts and see `hg help evolve.interrupted`
796334340cad evolve: make one missed error to align other error messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
   303
  [1]
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   304
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   305
  $ hg evolve --abort
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   306
  evolve aborted
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   307
  working directory is now at e49523854bc8
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   308
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   309
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   310
  @  7:e49523854bc8 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   311
  |   () draft
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
   312
  | o  6:69bdd23a9b0d added d
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   313
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   314
  o |  3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   315
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   316
  o |  2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   317
  |/    () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   318
  o  1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   319
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   320
  o  0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   321
      () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   322
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   323
Creating content-divergence on multiple parents when gca of divergent changesets
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   324
is parent of one of the divergents and merging divergent leads to conflicts
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   325
---------------------------------------------------------------------------------
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   326
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   327
  $ hg up 69bdd23a9b0d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   328
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   329
  $ hg rm c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   330
  $ echo wat > d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   331
  $ hg amend
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   332
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   333
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   334
  @  8:33e4442acf98 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   335
  |   () draft
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
   336
  | o  7:e49523854bc8 added d
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   337
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   338
  | o  3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   339
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   340
  | o  2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   341
  |/    () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   342
  o  1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   343
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   344
  o  0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   345
      () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   346
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   347
  $ hg evolve --content-divergent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   348
  merge:[7] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   349
  with: [8] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   350
  base: [4] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   351
  rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   352
  updating to "local" side of the conflict: e49523854bc8
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   353
  merging "other" content-divergent changeset 'a663d1567f0b'
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   354
  merging d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   355
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   356
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   357
  fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   358
  [1]
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   359
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   360
  $ hg evolve --abort
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   361
  evolve aborted
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   362
  working directory is now at 33e4442acf98
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   363
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   364
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   365
  @  8:33e4442acf98 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   366
  |   () draft
4516
f54bb6eaf5e6 test-compat: merge mercurial-4.5 into mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4513
diff changeset
   367
  | o  7:e49523854bc8 added d
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   368
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   369
  | o  3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   370
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   371
  | o  2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   372
  |/    () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   373
  o  1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   374
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   375
  o  0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   376
      () draft
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   377
  $ cd ..
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   378
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   379
Tests for the --stop flag for `hg evolve` command while resolving content-divergence
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   380
==================================================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   381
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   382
The `--stop` flag stops the interrupted evolution and delete the state file so
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   383
user can do other things and comeback and do evolution later on
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   384
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   385
This is testing cases when `hg evolve` command is doing content-divergence resolution.
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   386
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   387
Setup
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   388
=====
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   389
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   390
  $ hg init stoprepo
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   391
  $ cd stoprepo
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   392
  $ echo ".*\.orig" > .hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   393
  $ hg add .hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   394
  $ hg ci -m "added hgignore"
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   395
  $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   396
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   397
  $ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   398
  @  4:c41c793e0ef1 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   399
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   400
  o  3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   401
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   402
  o  2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   403
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   404
  o  1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   405
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   406
  o  0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   407
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   408
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   409
Creating content divergence, resolution of which will lead to conflicts
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   410
-----------------------------------------------------------------------
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   411
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   412
  $ echo bar > d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   413
  $ hg amend
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   414
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   415
  $ hg up c41c793e0ef1 --hidden
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   416
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   417
  working directory parent is obsolete! (c41c793e0ef1)
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   418
  (use 'hg evolve' to update to its successor: e49523854bc8)
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   419
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   420
  $ echo foobar > d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   421
  $ hg amend
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   422
  $ hg glog --hidden
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   423
  @  6:9c1631e352d9 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   424
  |   () draft
4553
aafd51f145ea test-compat: adapt test output to 4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4516
diff changeset
   425
  | o  5:e49523854bc8 added d
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   426
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   427
  | x  4:c41c793e0ef1 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   428
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   429
  o  3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   430
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   431
  o  2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   432
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   433
  o  1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   434
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   435
  o  0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   436
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   437
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   438
  $ hg evolve --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   439
  merge:[6] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   440
  with: [5] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   441
  base: [4] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   442
  merging "other" content-divergent changeset 'e49523854bc8'
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   443
  merging d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   444
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   445
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   446
  fix conflicts and see `hg help evolve.interrupted`
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   447
  [1]
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   448
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   449
  $ hg evolve --stop
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   450
  stopped the interrupted evolve
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   451
  working directory is now at 9c1631e352d9
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   452
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   453
  $ hg glog --hidden
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   454
  @  6:9c1631e352d9 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   455
  |   () draft
4553
aafd51f145ea test-compat: adapt test output to 4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4516
diff changeset
   456
  | o  5:e49523854bc8 added d
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   457
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   458
  | x  4:c41c793e0ef1 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   459
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   460
  o  3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   461
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   462
  o  2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   463
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   464
  o  1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   465
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   466
  o  0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   467
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   468
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   469
Content divergence with parent change which will result in conflicts while
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   470
merging
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   471
---------------------------------------------------------------------------
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   472
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   473
  $ hg rebase -r . -d .^^^ --config extensions.rebase=
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   474
  rebasing 6:9c1631e352d9 "added d" (tip)
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   475
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   476
  $ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   477
  @  7:517d4375cb72 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   478
  |   () draft
4553
aafd51f145ea test-compat: adapt test output to 4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4516
diff changeset
   479
  | o  5:e49523854bc8 added d
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   480
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   481
  | o  3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   482
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   483
  | o  2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   484
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   485
  o  1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   486
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   487
  o  0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   488
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   489
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   490
  $ hg evolve --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   491
  merge:[5] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   492
  with: [7] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   493
  base: [4] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   494
  rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   495
  updating to "local" side of the conflict: e49523854bc8
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   496
  merging "other" content-divergent changeset '606ad96040fc'
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   497
  merging d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   498
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   499
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   500
  fix conflicts and see `hg help evolve.interrupted`
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   501
  [1]
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   502
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   503
  $ hg evolve --stop
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   504
  stopped the interrupted evolve
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   505
  working directory is now at 517d4375cb72
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   506
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   507
  $ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   508
  @  7:517d4375cb72 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   509
  |   () draft
4553
aafd51f145ea test-compat: adapt test output to 4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4516
diff changeset
   510
  | o  5:e49523854bc8 added d
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   511
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   512
  | o  3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   513
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   514
  | o  2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   515
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   516
  o  1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   517
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   518
  o  0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   519
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   520
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   521
Content-divergence with parent-change which will result in conflicts while
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   522
relocation
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   523
---------------------------------------------------------------------------
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   524
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   525
  $ echo babar > c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   526
  $ hg add c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   527
  $ hg amend
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   528
  $ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   529
  @  8:8fd1c4bd144c added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   530
  |   () draft
4553
aafd51f145ea test-compat: adapt test output to 4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4516
diff changeset
   531
  | o  5:e49523854bc8 added d
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   532
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   533
  | o  3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   534
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   535
  | o  2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   536
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   537
  o  1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   538
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   539
  o  0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   540
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   541
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   542
  $ hg evolve --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   543
  merge:[5] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   544
  with: [8] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   545
  base: [4] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   546
  rebasing "other" content-divergent changeset 8fd1c4bd144c on ca1b80f7960a
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   547
  merging c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   548
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   549
  fix conflicts and see `hg help evolve.interrupted`
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   550
  [1]
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   551
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   552
  $ hg diff
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   553
  diff -r ca1b80f7960a c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   554
  --- a/c	Thu Jan 01 00:00:00 1970 +0000
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   555
  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   556
  @@ -1,1 +1,5 @@
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   557
  +<<<<<<< destination: ca1b80f7960a - test: added c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   558
   foo
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   559
  +=======
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   560
  +babar
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   561
  +>>>>>>> evolving:    8fd1c4bd144c - test: added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   562
  diff -r ca1b80f7960a d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   563
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   564
  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   565
  @@ -0,0 +1,1 @@
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   566
  +foobar
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   567
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   568
  $ hg evolve --stop
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   569
  stopped the interrupted evolve
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   570
  working directory is now at ca1b80f7960a
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   571
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   572
XXX: we should have preserved the wdir to be at rev 8
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   573
  $ hg glog
4553
aafd51f145ea test-compat: adapt test output to 4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4516
diff changeset
   574
  o  8:8fd1c4bd144c added d
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   575
  |   () draft
4553
aafd51f145ea test-compat: adapt test output to 4.4
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4516
diff changeset
   576
  | o  5:e49523854bc8 added d
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   577
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   578
  | @  3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   579
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   580
  | o  2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   581
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   582
  o  1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   583
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   584
  o  0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   585
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   586
  $ cd ..