tests/test-evolve-content-divergent-interrupted.t
author Sushil khanchi <sushilkhanchi97@gmail.com>
Mon, 25 Nov 2019 19:12:51 +0530
changeset 5014 35870ce163ee
parent 4991 2928f35023a1
child 5079 1f92a6aa40d6
child 5091 308c1e09f80f
permissions -rw-r--r--
evolve: use more specific key name to store in evolvestate Now, as we also relocate divergent cset if required, so let's use more specific key to track the relocation of "divergent" and "other".
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
  updated to hidden changeset c41c793e0ef1
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    59
  (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    60
  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
    61
  (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
    62
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    63
  $ echo foobar > d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    64
  $ hg amend
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    65
  2 new content-divergent changesets
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    66
  $ hg glog --hidden
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    67
  @  6:9c1631e352d9 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    68
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    69
  | *  5:e49523854bc8 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    70
  |/    () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    71
  | x  4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    72
  |/    () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    73
  o  3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    74
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    75
  o  2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    76
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    77
  o  1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    78
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    79
  o  0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    80
      () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    81
4578
75e76141cba2 tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents: 4481
diff changeset
    82
  $ hg evolve --content-divergent --no-all
3773
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    83
  merge:[6] added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    84
  with: [5] added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    85
  base: [4] added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    86
  merging d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    87
  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
    88
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
    89
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
    90
  (see 'hg help evolve.interrupted')
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
    91
  [1]
3773
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    92
3839
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    93
  $ hg status -v
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    94
  M d
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    95
  # 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
    96
  
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    97
  # Unresolved merge conflicts:
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    98
  # 
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    99
  #     d
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   100
  # 
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   101
  # 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
   102
  
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   103
  # To continue:    hg evolve --continue
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   104
  # To abort:       hg evolve --abort
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   105
  # To stop:        hg evolve --stop
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   106
  # (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
   107
  
3976
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   108
  $ hg parents
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   109
  changeset:   6:9c1631e352d9
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   110
  tag:         tip
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   111
  parent:      3:ca1b80f7960a
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   112
  user:        test
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   113
  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
   114
  instability: content-divergent
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   115
  summary:     added d
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   116
  
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   117
  changeset:   5:e49523854bc8
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   118
  parent:      3:ca1b80f7960a
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   119
  user:        test
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   120
  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
   121
  instability: content-divergent
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   122
  summary:     added d
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   123
  
3839
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   124
3773
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   125
  $ hg evolve --abort
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   126
  evolve aborted
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   127
  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
   128
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   129
  $ hg glog --hidden
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   130
  @  6:9c1631e352d9 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   131
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   132
  | *  5:e49523854bc8 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   133
  |/    () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   134
  | x  4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   135
  |/    () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   136
  o  3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   137
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   138
  o  2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   139
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   140
  o  1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   141
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   142
  o  0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   143
      () draft
3791
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
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
   146
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
   147
-----------------------------------------------------------------------------
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   148
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   149
  $ echo watbar > d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   150
  $ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   151
  $ hg up .^
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   152
  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
   153
  $ echo bar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   154
  $ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   155
  2 new orphan changesets
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   156
  $ 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
   157
  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
   158
  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
   159
  (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
   160
  $ echo foobar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   161
  $ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   162
  2 new content-divergent changesets
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   163
  $ echo bar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   164
  $ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   165
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   166
  $ hg glog --hidden
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   167
  @  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
   168
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   169
  | 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
   170
  |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   171
  | *  8:2ba73e31f264 added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   172
  |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   173
  | *  7:f0f1694f123e added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   174
  | |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   175
  | | 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
   176
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   177
  | | *  5:e49523854bc8 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   178
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   179
  | | 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
   180
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   181
  | 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
   182
  |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   183
  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
   184
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   185
  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
   186
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   187
  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
   188
      () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   189
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   190
  $ 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
   191
  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
   192
  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
   193
  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
   194
  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
   195
  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
   196
  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
   197
  base: [4] added d
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4676
diff changeset
   198
  rebasing "divergent" content-divergent changeset e49523854bc8 on ddcf04e1458c
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   199
  merging d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   200
  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
   201
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
   202
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
   203
  (see 'hg help evolve.interrupted')
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   204
  [1]
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   205
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   206
  $ hg evolve --abort
4991
2928f35023a1 evolve: make sure divergence resolution doesn't undo changes (issue6203)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4676
diff changeset
   207
  1 new orphan changesets
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   208
  2 new content-divergent changesets
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   209
  evolve aborted
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   210
  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
   211
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   212
  $ hg glog --hidden
3792
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   213
  @  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
   214
  |   () draft
3792
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   215
  | 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
   216
  |/    () draft
3832
fb821ed44f86 evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3792
diff changeset
   217
  | *  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
   218
  |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   219
  | *  7:f0f1694f123e added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   220
  | |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   221
  | | 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
   222
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   223
  | | *  5:e49523854bc8 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   224
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   225
  | | 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
   226
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   227
  | 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
   228
  |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   229
  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
   230
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   231
  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
   232
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   233
  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
   234
      () draft
3792
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   235
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   236
  $ hg obslog -r . --all
3832
fb821ed44f86 evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3792
diff changeset
   237
  *  2ba73e31f264 (8) added c
fb821ed44f86 evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3792
diff changeset
   238
  |
fb821ed44f86 evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3792
diff changeset
   239
  | @  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
   240
  | |
3832
fb821ed44f86 evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3792
diff changeset
   241
  | 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
   242
  |/     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
   243
  |
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   244
  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
   245
       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
   246
       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
   247
  
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   248
  $ cd ..
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   249
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   250
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
   251
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
   252
---------------------------------------------------------------------------------
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   253
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   254
  $ hg init multiparent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   255
  $ cd multiparent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   256
  $ echo ".*\.orig" > .hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   257
  $ hg add .hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   258
  $ 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
   259
  $ 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
   260
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   261
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   262
  @  4:c41c793e0ef1 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   263
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   264
  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
   265
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   266
  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
   267
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   268
  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
   269
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   270
  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
   271
      () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   272
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   273
  $ 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
   274
  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
   275
  $ echo bar > c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   276
  $ hg add c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   277
  $ hg amend
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   278
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   279
  $ hg up --hidden c41c793e0ef1
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   280
  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
   281
  updated to hidden changeset c41c793e0ef1
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   282
  (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d)
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   283
  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
   284
  (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
   285
  $ echo bar > d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   286
  $ hg amend
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   287
  2 new content-divergent changesets
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   288
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   289
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   290
  @  7:e49523854bc8 added d
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
  | *  6:69bdd23a9b0d added d
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
  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
   295
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   296
  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
   297
  |/    () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   298
  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
   299
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   300
  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
   301
      () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   302
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   303
  $ hg evolve --content-divergent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   304
  merge:[7] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   305
  with: [6] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   306
  base: [4] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   307
  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
   308
  merging c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   309
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
   310
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
   311
  (see 'hg help evolve.interrupted')
3853
796334340cad evolve: make one missed error to align other error messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
   312
  [1]
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   313
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   314
  $ hg evolve --abort
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   315
  evolve aborted
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   316
  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
   317
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   318
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   319
  @  7:e49523854bc8 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   320
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   321
  | *  6:69bdd23a9b0d added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   322
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   323
  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
   324
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   325
  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
   326
  |/    () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   327
  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
   328
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   329
  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
   330
      () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   331
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   332
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
   333
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
   334
---------------------------------------------------------------------------------
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   335
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   336
  $ hg up 69bdd23a9b0d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   337
  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
   338
  $ hg rm c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   339
  $ echo wat > d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   340
  $ hg amend
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   341
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   342
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   343
  @  8:33e4442acf98 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   344
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   345
  | *  7:e49523854bc8 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   346
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   347
  | 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
   348
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   349
  | 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
   350
  |/    () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   351
  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
   352
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   353
  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
   354
      () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   355
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   356
  $ hg evolve --content-divergent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   357
  merge:[7] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   358
  with: [8] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   359
  base: [4] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   360
  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
   361
  merging d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   362
  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
   363
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
   364
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
   365
  (see 'hg help evolve.interrupted')
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   366
  [1]
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   367
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   368
  $ hg evolve --abort
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   369
  evolve aborted
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   370
  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
   371
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   372
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   373
  @  8:33e4442acf98 added d
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
  | *  7:e49523854bc8 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   376
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   377
  | 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
   378
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   379
  | 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
   380
  |/    () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   381
  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
   382
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   383
  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
   384
      () draft
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   385
  $ cd ..
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
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
   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
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
   391
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
   392
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   393
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
   394
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   395
Setup
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
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   398
  $ hg init stoprepo
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   399
  $ cd stoprepo
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   400
  $ echo ".*\.orig" > .hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   401
  $ hg add .hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   402
  $ 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
   403
  $ 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
   404
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   405
  $ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   406
  @  4:c41c793e0ef1 added d
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
  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
   409
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   410
  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
   411
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   412
  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
   413
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   414
  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
   415
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   416
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   417
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
   418
-----------------------------------------------------------------------
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 bar > 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
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   423
  $ hg up c41c793e0ef1 --hidden
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   424
  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
   425
  updated to hidden changeset c41c793e0ef1
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   426
  (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   427
  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
   428
  (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
   429
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   430
  $ echo foobar > d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   431
  $ hg amend
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   432
  2 new content-divergent changesets
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   433
  $ hg glog --hidden
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   434
  @  6:9c1631e352d9 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   435
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   436
  | *  5:e49523854bc8 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   437
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   438
  | 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
   439
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   440
  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
   441
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   442
  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
   443
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   444
  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
   445
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   446
  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
   447
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   448
4578
75e76141cba2 tests: add --no-all to hg evolve to reduce test changes
Anton Shestakov <av6@dwimlabs.net>
parents: 4481
diff changeset
   449
  $ hg evolve --content-divergent --no-all
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   450
  merge:[6] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   451
  with: [5] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   452
  base: [4] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   453
  merging d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   454
  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
   455
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
   456
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
   457
  (see 'hg help evolve.interrupted')
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   458
  [1]
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   459
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   460
  $ hg evolve --stop
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   461
  stopped the interrupted evolve
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   462
  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
   463
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   464
  $ hg glog --hidden
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   465
  @  6:9c1631e352d9 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   466
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   467
  | *  5:e49523854bc8 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   468
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   469
  | 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
   470
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   471
  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
   472
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   473
  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
   474
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   475
  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
   476
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   477
  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
   478
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   479
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   480
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
   481
merging
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   482
---------------------------------------------------------------------------
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   483
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   484
  $ 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
   485
  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
   486
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   487
  $ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   488
  @  7:517d4375cb72 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   489
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   490
  | *  5:e49523854bc8 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   491
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   492
  | 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
   493
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   494
  | 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
   495
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   496
  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
   497
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   498
  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
   499
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   500
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   501
  $ hg evolve --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   502
  merge:[5] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   503
  with: [7] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   504
  base: [4] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   505
  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
   506
  merging d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   507
  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
   508
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
   509
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
   510
  (see 'hg help evolve.interrupted')
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   511
  [1]
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   512
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   513
  $ hg evolve --stop
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   514
  stopped the interrupted evolve
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   515
  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
   516
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   517
  $ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   518
  @  7:517d4375cb72 added d
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
  | *  5:e49523854bc8 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   521
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   522
  | 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
   523
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   524
  | 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
   525
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   526
  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
   527
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   528
  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
   529
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   530
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   531
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
   532
relocation
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   533
---------------------------------------------------------------------------
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   534
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   535
  $ echo babar > c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   536
  $ hg add c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   537
  $ hg amend
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   538
  $ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   539
  @  8:8fd1c4bd144c added d
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
  | *  5:e49523854bc8 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   542
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   543
  | 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
   544
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   545
  | 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
   546
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   547
  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
   548
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   549
  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
   550
      () draft
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 evolve --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   553
  merge:[5] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   554
  with: [8] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   555
  base: [4] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   556
  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
   557
  merging c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   558
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
   559
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4633
diff changeset
   560
  (see 'hg help evolve.interrupted')
4481
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   561
  [1]
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   562
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   563
  $ hg diff
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   564
  diff -r ca1b80f7960a c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   565
  --- 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
   566
  +++ 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
   567
  @@ -1,1 +1,5 @@
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   568
  +<<<<<<< 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
   569
   foo
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   570
  +=======
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   571
  +babar
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   572
  +>>>>>>> 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
   573
  diff -r ca1b80f7960a d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   574
  --- /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
   575
  +++ 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
   576
  @@ -0,0 +1,1 @@
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   577
  +foobar
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   578
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   579
  $ hg evolve --stop
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   580
  stopped the interrupted evolve
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   581
  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
   582
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   583
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
   584
  $ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   585
  *  8:8fd1c4bd144c added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   586
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   587
  | *  5:e49523854bc8 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   588
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   589
  | @  3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   590
  | |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   591
  | 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
   592
  |/    () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   593
  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
   594
  |   () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   595
  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
   596
      () draft
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3976
diff changeset
   597
  $ cd ..