tests/test-evolve-abort-contentdiv.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Mon, 27 Aug 2018 00:35:51 +0200
changeset 4006 21aee0a596ce
parent 3976 d081528bb372
child 3993 85c99079d41f
permissions -rw-r--r--
sqlcache: also ignore integrity error integrity error can happens when multiple client tries to warm similar cache. Given we leave multiple hole in the cache that can be warmed by anyone, this is harder to avoid that we would like. We simply catch the error in this case. Someone will warm the missing entry later.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3773
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     1
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
     2
======================================================================================
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     3
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     4
The `--abort` flag aborts the interuppted evolve by undoing all the work which
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     5
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
     6
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
     7
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     8
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
     9
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    10
Setup
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
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    13
  $ cat >> $HGRCPATH <<EOF
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    14
  > [phases]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    15
  > publish = False
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    16
  > [alias]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    17
  > 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
    18
  > [extensions]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    19
  > EOF
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    20
  $ 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
    21
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    22
  $ hg init abortrepo
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    23
  $ cd abortrepo
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    24
  $ echo ".*\.orig" > .hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    25
  $ hg add .hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    26
  $ hg ci -m "added hgignore"
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    27
  $ 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
    28
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    29
  $ hg glog
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    30
  @  4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    31
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    32
  o  3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    33
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    34
  o  2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    35
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    36
  o  1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    37
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    38
  o  0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    39
      () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    40
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    41
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
    42
-----------------------------------------------------------------------
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    43
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    44
  $ echo bar > d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    45
  $ hg amend
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    46
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    47
  $ hg up c41c793e0ef1 --hidden
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    48
  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
    49
  updated to hidden changeset c41c793e0ef1
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    50
  (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
    51
  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
    52
  (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
    53
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    54
  $ echo foobar > d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    55
  $ hg amend
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    56
  2 new content-divergent changesets
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    57
  $ hg glog --hidden
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    58
  @  6:9c1631e352d9 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    59
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    60
  | *  5:e49523854bc8 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    61
  |/    () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    62
  | x  4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    63
  |/    () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    64
  o  3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    65
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    66
  o  2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    67
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    68
  o  1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    69
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    70
  o  0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    71
      () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    72
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    73
  $ hg evolve --content-divergent
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    74
  merge:[6] added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    75
  with: [5] added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    76
  base: [4] added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    77
  merging "other" content-divergent changeset 'e49523854bc8'
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    78
  merging d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    79
  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
    80
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
    81
  fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
    82
  [1]
3773
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    83
3839
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    84
  $ hg status -v
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    85
  M d
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    86
  # 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
    87
  
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    88
  # Unresolved merge conflicts:
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    89
  # 
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    90
  #     d
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    91
  # 
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    92
  # 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
    93
  
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    94
  # To continue:    hg evolve --continue
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    95
  # To abort:       hg evolve --abort
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    96
  # To stop:        hg evolve --stop
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
    97
  # (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
    98
  
3976
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
    99
  $ hg parents
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   100
  changeset:   6:9c1631e352d9
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   101
  tag:         tip
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   102
  parent:      3:ca1b80f7960a
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   103
  user:        test
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   104
  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
   105
  instability: content-divergent
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   106
  summary:     added d
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   107
  
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   108
  changeset:   5:e49523854bc8
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   109
  parent:      3:ca1b80f7960a
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   110
  user:        test
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   111
  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
   112
  instability: content-divergent
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   113
  summary:     added d
d081528bb372 tests: demonstrate the interrupted evolve does not set p2
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 3853
diff changeset
   114
  
3839
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3832
diff changeset
   115
3773
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   116
  $ hg evolve --abort
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   117
  evolve aborted
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   118
  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
   119
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   120
  $ hg glog --hidden
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   121
  @  6:9c1631e352d9 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   122
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   123
  | *  5:e49523854bc8 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   124
  |/    () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   125
  | x  4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   126
  |/    () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   127
  o  3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   128
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   129
  o  2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   130
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   131
  o  1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   132
  |   () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   133
  o  0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   134
      () draft
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   135
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   136
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
   137
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
   138
-----------------------------------------------------------------------------
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   139
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   140
  $ echo watbar > d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   141
  $ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   142
  $ hg up .^
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   143
  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
   144
  $ echo bar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   145
  $ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   146
  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
   147
  $ 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
   148
  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
   149
  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
   150
  (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
   151
  $ echo foobar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   152
  $ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   153
  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
   154
  $ echo bar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   155
  $ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   156
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   157
  $ hg glog --hidden
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   158
  @  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
   159
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   160
  | 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
   161
  |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   162
  | *  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
   163
  |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   164
  | *  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
   165
  | |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   166
  | | 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
   167
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   168
  | | *  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
   169
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   170
  | | x  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
   171
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   172
  | 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
   173
  |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   174
  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
   175
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   176
  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
   177
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   178
  o  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
   179
      () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   180
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   181
  $ 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
   182
  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
   183
  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
   184
  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
   185
  updating to "local" side of the conflict: 2ba73e31f264
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   186
  merging "other" content-divergent changeset '491e10505bae'
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   187
  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
   188
  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
   189
  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
   190
  base: [4] added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   191
  updating to "local" side of the conflict: e49523854bc8
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   192
  merging "other" content-divergent changeset 'f0f1694f123e'
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   193
  merging d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   194
  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
   195
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   196
  fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   197
  [1]
3791
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   198
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   199
  $ hg evolve --abort
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   200
  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
   201
  evolve aborted
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   202
  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
   203
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   204
  $ hg glog --hidden
3792
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   205
  @  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
   206
  |   () draft
3792
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   207
  | 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
   208
  |/    () draft
3832
fb821ed44f86 evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3792
diff changeset
   209
  | *  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
   210
  |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   211
  | *  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
   212
  | |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   213
  | | 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
   214
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   215
  | | *  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
   216
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   217
  | | 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
   218
  | |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   219
  | 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
   220
  |/    () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   221
  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
   222
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   223
  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
   224
  |   () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3773
diff changeset
   225
  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
   226
      () draft
3792
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   227
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   228
  $ 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
   229
  *  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
   230
  |
fb821ed44f86 evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3792
diff changeset
   231
  | @  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
   232
  | |
3832
fb821ed44f86 evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3792
diff changeset
   233
  | 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
   234
  |/     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
   235
  |
bb7d1616407f evolve: return the new node formed only as the replacement
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3791
diff changeset
   236
  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
   237
       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
   238
       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
   239
  
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   240
  $ cd ..
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   241
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   242
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
   243
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
   244
---------------------------------------------------------------------------------
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   245
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   246
  $ hg init multiparent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   247
  $ cd multiparent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   248
  $ echo ".*\.orig" > .hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   249
  $ hg add .hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   250
  $ 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
   251
  $ 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
   252
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   253
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   254
  @  4:c41c793e0ef1 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   255
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   256
  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
   257
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   258
  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
   259
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   260
  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
   261
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   262
  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
   263
      () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   264
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   265
  $ 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
   266
  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
   267
  $ echo bar > c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   268
  $ hg add c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   269
  $ hg amend
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   270
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   271
  $ hg up --hidden c41c793e0ef1
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   272
  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
   273
  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
   274
  (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
   275
  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
   276
  (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
   277
  $ echo bar > d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   278
  $ hg amend
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   279
  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
   280
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   281
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   282
  @  7:e49523854bc8 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   283
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   284
  | *  6:69bdd23a9b0d added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   285
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   286
  o |  3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   287
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   288
  o |  2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   289
  |/    () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   290
  o  1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   291
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   292
  o  0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   293
      () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   294
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   295
  $ hg evolve --content-divergent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   296
  merge:[7] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   297
  with: [6] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   298
  base: [4] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   299
  rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   300
  merging c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   301
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
3853
796334340cad evolve: make one missed error to align other error messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
   302
  fix conflicts and see `hg help evolve.interrupted`
796334340cad evolve: make one missed error to align other error messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
   303
  [1]
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   304
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   305
  $ hg evolve --abort
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   306
  evolve aborted
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   307
  working directory is now at e49523854bc8
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   308
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   309
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   310
  @  7:e49523854bc8 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   311
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   312
  | *  6:69bdd23a9b0d added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   313
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   314
  o |  3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   315
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   316
  o |  2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   317
  |/    () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   318
  o  1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   319
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   320
  o  0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   321
      () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   322
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   323
Creating content-divergence on multiple parents when gca of divergent changesets
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   324
is parent of one of the divergents and merging divergent leads to conflicts
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   325
---------------------------------------------------------------------------------
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   326
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   327
  $ hg up 69bdd23a9b0d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   328
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   329
  $ hg rm c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   330
  $ echo wat > d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   331
  $ hg amend
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   332
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   333
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   334
  @  8:33e4442acf98 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   335
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   336
  | *  7:e49523854bc8 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   337
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   338
  | o  3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   339
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   340
  | o  2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   341
  |/    () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   342
  o  1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   343
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   344
  o  0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   345
      () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   346
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   347
  $ hg evolve --content-divergent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   348
  merge:[7] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   349
  with: [8] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   350
  base: [4] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   351
  rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   352
  updating to "local" side of the conflict: e49523854bc8
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   353
  merging "other" content-divergent changeset 'a663d1567f0b'
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   354
  merging d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   355
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   356
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   357
  fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3846
diff changeset
   358
  [1]
3841
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   359
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   360
  $ hg evolve --abort
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   361
  evolve aborted
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   362
  working directory is now at 33e4442acf98
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   363
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   364
  $ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   365
  @  8:33e4442acf98 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   366
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   367
  | *  7:e49523854bc8 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   368
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   369
  | o  3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   370
  | |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   371
  | o  2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   372
  |/    () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   373
  o  1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   374
  |   () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   375
  o  0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3839
diff changeset
   376
      () draft