tests/test-evolve-content-divergent-relocation.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Wed, 05 Jun 2019 17:45:45 +0200
branchmercurial-4.6
changeset 4673 3ef4980353af
parent 4633 61c2518cd6d2
parent 4513 d70db7e455dc
child 4675 79bc0f1a832e
child 4784 ecf0f3bc7468
permissions -rw-r--r--
test-compat: merge mercurial-4.7 into mercurial-4.6
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: 4424
diff changeset
     1
======================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4424
diff changeset
     2
Tests the resolution of content divergence: relocation
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4424
diff changeset
     3
======================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4424
diff changeset
     4
d02a7c8cdee5 test: consolidate the content-divergent test cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4424
diff changeset
     5
This file intend to cover case where changesets need to be moved to different parents
3790
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     6
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     7
  $ cat >> $HGRCPATH <<EOF
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     8
  > [alias]
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     9
  > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) [{branch}] {phase}"
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    10
  > [phases]
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
    11
  > publish = False
3790
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    12
  > [extensions]
3804
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    13
  > rebase =
3790
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    14
  > EOF
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    15
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    16
3804
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    17
Testing resolution of content-divergent changesets when they are on different
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
    18
parents and resolution and relocation wont result in conflicts
3804
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    19
------------------------------------------------------------------------------
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    20
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    21
  $ hg init multiparents
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    22
  $ cd multiparents
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    23
  $ echo ".*\.orig" > .hgignore
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    24
  $ hg add .hgignore
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    25
  $ hg ci -m "added hgignore"
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    26
  $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    27
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    28
  $ hg glog
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    29
  @  4:c41c793e0ef1 added d
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    30
  |   () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    31
  o  3:ca1b80f7960a added c
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    32
  |   () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    33
  o  2:b1661037fa25 added b
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    34
  |   () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    35
  o  1:c7586e2a9264 added a
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    36
  |   () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    37
  o  0:8fa14d15e168 added hgignore
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    38
      () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    39
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    40
  $ hg up .^^
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    41
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    42
  $ echo bar > b
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    43
  $ hg amend
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    44
  2 new orphan changesets
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    45
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    46
  $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    47
  rebasing 2:b1661037fa25 "added b"
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    48
  2 new content-divergent changesets
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    49
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    50
  $ hg glog
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    51
  *  6:da4b96f4a8d6 added b
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    52
  |   () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    53
  | @  5:7ed0642d644b added b
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    54
  | |   () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    55
  | | *  4:c41c793e0ef1 added d
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    56
  | | |   () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    57
  | | *  3:ca1b80f7960a added c
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    58
  | | |   () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    59
  | | x  2:b1661037fa25 added b
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    60
  | |/    () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    61
  | o  1:c7586e2a9264 added a
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    62
  |/    () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    63
  o  0:8fa14d15e168 added hgignore
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    64
      () [default] draft
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    65
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    66
  $ hg evolve --content-divergent
3805
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    67
  merge:[5] added b
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    68
  with: [6] added b
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    69
  base: [2] added b
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    70
  rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    71
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
    72
  working directory is now at 171614c9a791
3804
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    73
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    74
  $ hg glog
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
    75
  @  8:171614c9a791 added b
3804
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    76
  |   () [default] draft
3805
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    77
  | *  4:c41c793e0ef1 added d
3804
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    78
  | |   () [default] draft
3805
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    79
  | *  3:ca1b80f7960a added c
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    80
  | |   () [default] draft
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    81
  | x  2:b1661037fa25 added b
3804
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    82
  |/    () [default] draft
3805
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    83
  o  1:c7586e2a9264 added a
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    84
  |   () [default] draft
3804
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    85
  o  0:8fa14d15e168 added hgignore
509b1e66f0b9 tests: add tests for resolving content-divergence with parent change
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3802
diff changeset
    86
      () [default] draft
3805
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    87
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    88
  $ hg exp
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    89
  # HG changeset patch
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    90
  # User test
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    91
  # Date 0 0
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    92
  #      Thu Jan 01 00:00:00 1970 +0000
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
    93
  # Node ID 171614c9a7914c53f531373b95632323fdbbac8d
3805
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    94
  # Parent  c7586e2a92645e473645847a7b69a6dc52be4276
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    95
  added b
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    96
  
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
    97
  diff -r c7586e2a9264 -r 171614c9a791 b
3805
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    98
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
    99
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
   100
  @@ -0,0 +1,1 @@
2410e7063692 evolve: implement resolution of content-divergence when on differet parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3804
diff changeset
   101
  +bar
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   102
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   103
Resolving orphans to get back to a normal graph
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   104
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   105
  $ hg evolve --all
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   106
  move:[3] added c
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   107
  atop:[8] added b
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   108
  move:[4] added d
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   109
  $ hg glog
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   110
  o  10:4ae4427ee9f8 added d
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   111
  |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   112
  o  9:917281f93fcb added c
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   113
  |   () [default] draft
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4490
diff changeset
   114
  @  8:171614c9a791 added b
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   115
  |   () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   116
  o  1:c7586e2a9264 added a
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   117
  |   () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   118
  o  0:8fa14d15e168 added hgignore
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   119
      () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   120
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   121
More testing!
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   122
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   123
  $ echo x > x
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   124
  $ hg ci -Aqm "added x"
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   125
  $ hg glog -r .
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   126
  @  11:71a392c714b5 added x
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   127
  |   () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   128
  ~
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   129
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   130
  $ echo foo > x
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   131
  $ hg branch bar
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   132
  marked working directory as branch bar
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   133
  (branches are permanent and global, did you want a bookmark?)
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   134
  $ hg amend -m "added foo to x"
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   135
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   136
  $ hg up 71a392c714b5 --hidden
4513
d70db7e455dc test-compat: merge mercurial-4.7 into mercurial-4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4512
diff changeset
   137
  updating to a hidden changeset 71a392c714b5
d70db7e455dc test-compat: merge mercurial-4.7 into mercurial-4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4512
diff changeset
   138
  (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d)
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   139
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   140
  working directory parent is obsolete! (71a392c714b5)
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   141
  (use 'hg evolve' to update to its successor: 1e1a50385a7d)
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   142
  $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   143
  rebasing 11:71a392c714b5 "added x"
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   144
  2 new content-divergent changesets
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   145
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   146
  $ hg glog
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   147
  @  13:1e4f6b3bb39b added x
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   148
  |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   149
  | *  12:1e1a50385a7d added foo to x
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   150
  | |   () [bar] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   151
  o |  10:4ae4427ee9f8 added d
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   152
  | |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   153
  o |  9:917281f93fcb added c
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   154
  |/    () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   155
  o  8:171614c9a791 added b
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   156
  |   () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   157
  o  1:c7586e2a9264 added a
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   158
  |   () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   159
  o  0:8fa14d15e168 added hgignore
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   160
      () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   161
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   162
  $ hg evolve --content-divergent
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   163
  merge:[13] added x
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   164
  with: [12] added foo to x
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   165
  base: [11] added x
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   166
  rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   167
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   168
  working directory is now at b006cf317e0e
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   169
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   170
  $ hg exp
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   171
  # HG changeset patch
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   172
  # User test
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   173
  # Date 0 0
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   174
  #      Thu Jan 01 00:00:00 1970 +0000
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   175
  # Branch bar
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   176
  # Node ID b006cf317e0ed16dbe786c439577475580f645f1
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   177
  # Parent  4ae4427ee9f8f0935211fd66360948b77ab5aee9
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   178
  added foo to x
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   179
  
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   180
  diff -r 4ae4427ee9f8 -r b006cf317e0e x
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   181
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   182
  +++ b/x	Thu Jan 01 00:00:00 1970 +0000
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   183
  @@ -0,0 +1,1 @@
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   184
  +foo
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   185
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   186
The above `hg exp` and the following log call demonstrates that message, content
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   187
and branch change is preserved in case of relocation
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   188
  $ hg glog
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   189
  @  15:b006cf317e0e added foo to x
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   190
  |   () [bar] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   191
  o  10:4ae4427ee9f8 added d
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   192
  |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   193
  o  9:917281f93fcb added c
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   194
  |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   195
  o  8:171614c9a791 added b
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   196
  |   () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   197
  o  1:c7586e2a9264 added a
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   198
  |   () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   199
  o  0:8fa14d15e168 added hgignore
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   200
      () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   201
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   202
Testing when both the content-divergence are on different parents and resolution
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   203
will lead to conflicts
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   204
---------------------------------------------------------------------------------
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   205
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   206
  $ hg up .^^^
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   207
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   208
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   209
  $ echo y > y
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   210
  $ hg ci -Aqm "added y"
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   211
  $ hg glog -r .
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   212
  @  16:fc6ad2bac162 added y
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   213
  |   () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   214
  ~
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   215
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   216
  $ echo bar > y
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   217
  $ hg amend
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   218
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   219
  $ hg up fc6ad2bac162 --hidden
4513
d70db7e455dc test-compat: merge mercurial-4.7 into mercurial-4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4512
diff changeset
   220
  updating to a hidden changeset fc6ad2bac162
d70db7e455dc test-compat: merge mercurial-4.7 into mercurial-4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4512
diff changeset
   221
  (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba)
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   222
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   223
  working directory parent is obsolete! (fc6ad2bac162)
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   224
  (use 'hg evolve' to update to its successor: 2a9f6ccbdeba)
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   225
  $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   226
  rebasing 16:fc6ad2bac162 "added y"
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   227
  2 new content-divergent changesets
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   228
  $ echo wat > y
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   229
  $ hg amend
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   230
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   231
  $ hg glog
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   232
  @  19:b4575ed6fcfc added y
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   233
  |   () [bar] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   234
  | *  17:2a9f6ccbdeba added y
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   235
  | |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   236
  o |  15:b006cf317e0e added foo to x
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   237
  | |   () [bar] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   238
  o |  10:4ae4427ee9f8 added d
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   239
  | |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   240
  o |  9:917281f93fcb added c
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   241
  |/    () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   242
  o  8:171614c9a791 added b
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   243
  |   () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   244
  o  1:c7586e2a9264 added a
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   245
  |   () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   246
  o  0:8fa14d15e168 added hgignore
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   247
      () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   248
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   249
  $ hg evolve --content-divergent
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   250
  merge:[19] added y
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   251
  with: [17] added y
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   252
  base: [16] added y
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   253
  rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   254
  merging y
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   255
  warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   256
  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: 3850
diff changeset
   257
  fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3850
diff changeset
   258
  [1]
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   259
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   260
  $ echo watbar > y
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   261
  $ hg resolve -m
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   262
  (no more unresolved files)
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   263
  continue: hg evolve --continue
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   264
  $ hg evolve --continue
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   265
  working directory is now at 7bbcf24ddecf
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   266
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   267
  $ hg glog
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   268
  @  21:7bbcf24ddecf added y
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   269
  |   () [bar] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   270
  o  15:b006cf317e0e added foo to x
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   271
  |   () [bar] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   272
  o  10:4ae4427ee9f8 added d
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   273
  |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   274
  o  9:917281f93fcb added c
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   275
  |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   276
  o  8:171614c9a791 added b
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   277
  |   () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   278
  o  1:c7586e2a9264 added a
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   279
  |   () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   280
  o  0:8fa14d15e168 added hgignore
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   281
      () [default] draft
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   282
3807
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   283
  $ hg obslog -r . --all
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   284
  @    7bbcf24ddecf (21) added y
3809
f06ff8fee2f6 evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3807
diff changeset
   285
  |\
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   286
  x |  48f745db3f53 (20) added y
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   287
  | |    rewritten(branch, content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
3807
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   288
  | |
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   289
  | x  b4575ed6fcfc (19) added y
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   290
  | |    rewritten(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
3809
f06ff8fee2f6 evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3807
diff changeset
   291
  | |
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   292
  x |  2a9f6ccbdeba (17) added y
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   293
  | |    rewritten(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
3809
f06ff8fee2f6 evolvestate: store info about relocation while resolving content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3807
diff changeset
   294
  | |
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   295
  | x  96b677f01b81 (18) added y
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   296
  |/     rewritten(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3807
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   297
  |
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   298
  x  fc6ad2bac162 (16) added y
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   299
       rewritten(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000)
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   300
       rewritten(branch, parent) as 96b677f01b81 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
3807
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   301
  
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   302
3806
99469bb3854e tests: add tests for resolving content-divergence when different parents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3805
diff changeset
   303
checking that relocated commit is there
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   304
  $ hg exp 48f745db3f53 --hidden
3807
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   305
  # HG changeset patch
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   306
  # User test
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   307
  # Date 0 0
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   308
  #      Thu Jan 01 00:00:00 1970 +0000
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   309
  # Node ID 48f745db3f5300363ca248b9aeab20ff2a55fbb3
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   310
  # Parent  b006cf317e0ed16dbe786c439577475580f645f1
3807
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   311
  added y
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   312
  
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   313
  diff -r b006cf317e0e -r 48f745db3f53 y
3807
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   314
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   315
  +++ b/y	Thu Jan 01 00:00:00 1970 +0000
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   316
  @@ -0,0 +1,1 @@
03ccdc753582 evolve: commit the transaction if conflicts occur while merging content-div
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3806
diff changeset
   317
  +bar
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   318
4406
450487b4e1a3 tests: update the title of a test as it's not what it says
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4181
diff changeset
   319
Testing when the relocation will result in conflicts and merging also:
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   320
----------------------------------------------------------------------
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   321
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   322
  $ hg glog
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   323
  @  21:7bbcf24ddecf added y
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   324
  |   () [bar] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   325
  o  15:b006cf317e0e added foo to x
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   326
  |   () [bar] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   327
  o  10:4ae4427ee9f8 added d
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   328
  |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   329
  o  9:917281f93fcb added c
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   330
  |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   331
  o  8:171614c9a791 added b
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   332
  |   () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   333
  o  1:c7586e2a9264 added a
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   334
  |   () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   335
  o  0:8fa14d15e168 added hgignore
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   336
      () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   337
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   338
  $ hg up .^^^^
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   339
  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   340
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   341
  $ echo z > z
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   342
  $ hg ci -Aqm "added z"
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   343
  $ hg glog -r .
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   344
  @  22:daf1de08f3b0 added z
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   345
  |   () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   346
  ~
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   347
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   348
  $ echo foo > y
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   349
  $ hg add y
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   350
  $ hg amend
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   351
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   352
  $ hg up daf1de08f3b0 --hidden
4513
d70db7e455dc test-compat: merge mercurial-4.7 into mercurial-4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4512
diff changeset
   353
  updating to a hidden changeset daf1de08f3b0
d70db7e455dc test-compat: merge mercurial-4.7 into mercurial-4.6
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4512
diff changeset
   354
  (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080)
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   355
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   356
  working directory parent is obsolete! (daf1de08f3b0)
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   357
  (use 'hg evolve' to update to its successor: 3f7a1f693080)
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   358
  $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   359
  rebasing 22:daf1de08f3b0 "added z"
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   360
  2 new content-divergent changesets
3811
3273b178c202 evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3810
diff changeset
   361
  $ echo bar > z
3273b178c202 evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3810
diff changeset
   362
  $ hg amend
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   363
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   364
  $ hg glog
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   365
  @  25:53242575ffa9 added z
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   366
  |   () [bar] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   367
  | *  23:3f7a1f693080 added z
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   368
  | |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   369
  o |  21:7bbcf24ddecf added y
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   370
  | |   () [bar] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   371
  o |  15:b006cf317e0e added foo to x
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   372
  | |   () [bar] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   373
  o |  10:4ae4427ee9f8 added d
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   374
  | |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   375
  o |  9:917281f93fcb added c
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   376
  |/    () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   377
  o  8:171614c9a791 added b
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   378
  |   () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   379
  o  1:c7586e2a9264 added a
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   380
  |   () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   381
  o  0:8fa14d15e168 added hgignore
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   382
      () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   383
4407
7fd0cbf6190d evolve: change in a test which demonstrate divergence resolution can break
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4406
diff changeset
   384
  $ hg evolve --content-divergent --any
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   385
  merge:[25] added z
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   386
  with: [23] added z
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   387
  base: [22] added z
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   388
  rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   389
  merging y
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   390
  warning: conflicts while merging y! (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
   391
  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
   392
  [1]
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   393
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   394
  $ hg diff
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   395
  diff -r 7bbcf24ddecf y
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   396
  --- a/y	Thu Jan 01 00:00:00 1970 +0000
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   397
  +++ b/y	Thu Jan 01 00:00:00 1970 +0000
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   398
  @@ -1,1 +1,5 @@
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   399
  +<<<<<<< destination: 7bbcf24ddecf bar - test: added y
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   400
   watbar
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   401
  +=======
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   402
  +foo
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   403
  +>>>>>>> evolving:    3f7a1f693080 - test: added z
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   404
  diff -r 7bbcf24ddecf z
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   405
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   406
  +++ b/z	Thu Jan 01 00:00:00 1970 +0000
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   407
  @@ -0,0 +1,1 @@
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   408
  +z
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   409
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   410
  $ echo foo > y
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   411
  $ hg resolve -m
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   412
  (no more unresolved files)
3811
3273b178c202 evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3810
diff changeset
   413
  continue: hg evolve --continue
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   414
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   415
  $ hg evolve --continue
3881
9cf45b94f977 evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3853
diff changeset
   416
  evolving 23:3f7a1f693080 "added z"
3882
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   417
  merging y
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   418
  warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   419
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   420
  fix conflicts and see `hg help evolve.interrupted`
3881
9cf45b94f977 evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3853
diff changeset
   421
  [1]
9cf45b94f977 evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3853
diff changeset
   422
9cf45b94f977 evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3853
diff changeset
   423
  $ hg diff
3882
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   424
  diff -r 53242575ffa9 y
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   425
  --- a/y	Thu Jan 01 00:00:00 1970 +0000
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   426
  +++ b/y	Thu Jan 01 00:00:00 1970 +0000
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   427
  @@ -1,1 +1,5 @@
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   428
  +<<<<<<< local: 53242575ffa9 bar - test: added z
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   429
   watbar
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   430
  +=======
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   431
  +foo
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   432
  +>>>>>>> other: cdb0643c69fc - test: added z
3881
9cf45b94f977 evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3853
diff changeset
   433
9cf45b94f977 evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3853
diff changeset
   434
  $ echo foo > y
9cf45b94f977 evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3853
diff changeset
   435
  $ hg resolve -m
3882
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   436
  (no more unresolved files)
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   437
  continue: hg evolve --continue
3881
9cf45b94f977 evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3853
diff changeset
   438
  $ hg evolve --continue
3882
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   439
  working directory is now at 6fc7d9682de6
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   440
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   441
  $ hg glog
3882
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   442
  @  27:6fc7d9682de6 added z
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   443
  |   () [bar] draft
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   444
  o  21:7bbcf24ddecf added y
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   445
  |   () [bar] draft
3882
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   446
  o  15:b006cf317e0e added foo to x
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   447
  |   () [bar] draft
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   448
  o  10:4ae4427ee9f8 added d
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   449
  |   () [default] draft
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   450
  o  9:917281f93fcb added c
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   451
  |   () [default] draft
3846
f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3845
diff changeset
   452
  o  8:171614c9a791 added b
3810
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   453
  |   () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   454
  o  1:c7586e2a9264 added a
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   455
  |   () [default] draft
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   456
  o  0:8fa14d15e168 added hgignore
04fe01b0c0d0 tests: add more test of resolution of content-divergent changesets
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3809
diff changeset
   457
      () [default] draft
3811
3273b178c202 evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3810
diff changeset
   458
3273b178c202 evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3810
diff changeset
   459
  $ hg exp
3273b178c202 evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3810
diff changeset
   460
  # HG changeset patch
3273b178c202 evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3810
diff changeset
   461
  # User test
3273b178c202 evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3810
diff changeset
   462
  # Date 0 0
3273b178c202 evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3810
diff changeset
   463
  #      Thu Jan 01 00:00:00 1970 +0000
3881
9cf45b94f977 evolve: continue conflicted relocation content-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3853
diff changeset
   464
  # Branch bar
3882
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   465
  # Node ID 6fc7d9682de6e3bee6c8b1266b756ed7d522b7e4
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   466
  # Parent  7bbcf24ddecfe97d7c2ac6fa8c07c155c8fda47b
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   467
  added z
3811
3273b178c202 evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3810
diff changeset
   468
  
3882
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   469
  diff -r 7bbcf24ddecf -r 6fc7d9682de6 y
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   470
  --- a/y	Thu Jan 01 00:00:00 1970 +0000
3811
3273b178c202 evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3810
diff changeset
   471
  +++ b/y	Thu Jan 01 00:00:00 1970 +0000
3882
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   472
  @@ -1,1 +1,1 @@
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   473
  -watbar
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   474
  +foo
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   475
  diff -r 7bbcf24ddecf -r 6fc7d9682de6 z
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   476
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   477
  +++ b/z	Thu Jan 01 00:00:00 1970 +0000
3811
3273b178c202 evolve: store the evolvestate if relocation results in conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3810
diff changeset
   478
  @@ -0,0 +1,1 @@
3882
55b8c7e7e352 compat: temporarily move copies fix to compat.py
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3881
diff changeset
   479
  +bar
3844
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   480
48fbccfd1dff tests: add test of resolution of content-divergent stacks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3842
diff changeset
   481
  $ cd ..