tests/test-evolve-public-content-divergent-main.t
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 19 Dec 2019 21:36:59 -0800
changeset 5022 95af630d913a
parent 4676 b6c819facbe8
child 4784 ecf0f3bc7468
child 5079 1f92a6aa40d6
permissions -rw-r--r--
evolvecmd: fix a typo node->None
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
     1
=============================================================
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
     2
Tests the resolution of public content divergence: main cases
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
     3
=============================================================
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
     4
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
     5
This file intend to cover all the common cases of public content divergence.
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
     6
That is all the variant of:
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
     7
parent: same/different
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
     8
relocation: [no-]conflict
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
     9
merging: [no-]conflict
4383
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    10
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    11
Setup
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    12
=====
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    13
  $ cat >> $HGRCPATH <<EOF
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    14
  > [alias]
4625
a4fde4e3e763 templatekw: add `instabilities` alias for `troubles`
Matt Harbison <matt_harbison@yahoo.com>
parents: 4577
diff changeset
    15
  > glog = log -GT "{rev}:{node|short} {desc|firstline}\n {phase} {instabilities}\n\n"
4383
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    16
  > [phases]
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    17
  > publish = False
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    18
  > [extensions]
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    19
  > rebase =
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    20
  > EOF
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    21
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    22
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
    23
Testing when same parent, no conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
    24
--------------------------------------
4383
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    25
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    26
Prepare the repository:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    27
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
    28
  $ hg init pubdiv1
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
    29
  $ cd pubdiv1
4383
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    30
  $ for ch in a b; do
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    31
  >   echo $ch > $ch;
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    32
  >   hg ci -Aqm "added "$ch;
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    33
  > done;
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    34
  $ hg glog
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    35
  @  1:5f6d8a4bf34a added b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    36
  |   draft
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    37
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    38
  o  0:9092f1db7931 added a
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    39
      draft
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    40
  
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    41
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    42
Make an amend and change phase to public:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    43
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    44
  $ sed -i "1 i I am first" b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    45
  $ hg amend
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    46
  $ hg phase --public
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    47
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    48
Amend again to create a cset divergent to public one:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    49
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    50
  $ hg up 1 --hidden -q
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    51
  updated to hidden changeset 5f6d8a4bf34a
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    52
  (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f)
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    53
  working directory parent is obsolete! (5f6d8a4bf34a)
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    54
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    55
  $ echo "I am second" >> b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    56
  $ hg ci --amend -m "updated b"
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    57
  1 new content-divergent changesets
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    58
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    59
  $ hg glog
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    60
  @  3:dcdaf152280a updated b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    61
  |   draft content-divergent
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    62
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    63
  | o  2:44f360db368f added b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    64
  |/    public
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    65
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    66
  o  0:9092f1db7931 added a
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    67
      public
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    68
  
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    69
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    70
Lets resolve the public content-divergence:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    71
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    72
  $ hg evolve --content-divergent
4413
2360a1e050a6 evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4412
diff changeset
    73
  merge:[2] added b
2360a1e050a6 evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4412
diff changeset
    74
  with: [3] updated b
4383
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    75
  base: [1] added b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    76
  merging b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    77
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    78
  committed as c1aa9cfb6cf8
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    79
  working directory is now at c1aa9cfb6cf8
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    80
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    81
Following graph log shows that it correctly merged the two divergent csets:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    82
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    83
  $ hg glog -p
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    84
  @  5:c1aa9cfb6cf8 phase-divergent update to 44f360db368f:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    85
  |   draft
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    86
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    87
  |  diff -r 44f360db368f -r c1aa9cfb6cf8 b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    88
  |  --- a/b	Thu Jan 01 00:00:00 1970 +0000
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    89
  |  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    90
  |  @@ -1,2 +1,3 @@
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    91
  |   I am first
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    92
  |   b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    93
  |  +I am second
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    94
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    95
  o  2:44f360db368f added b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    96
  |   public
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    97
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    98
  |  diff -r 9092f1db7931 -r 44f360db368f b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    99
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   100
  |  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   101
  |  @@ -0,0 +1,2 @@
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   102
  |  +I am first
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   103
  |  +b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   104
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   105
  o  0:9092f1db7931 added a
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   106
      public
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   107
  
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   108
     diff -r 000000000000 -r 9092f1db7931 a
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   109
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   110
     +++ b/a	Thu Jan 01 00:00:00 1970 +0000
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   111
     @@ -0,0 +1,1 @@
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   112
     +a
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   113
  
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   114
  $ hg evolve -l
4384
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   115
  $ cd ..
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   116
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   117
Testing when same parent, merging conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   118
-------------------------------------------
4384
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   119
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   120
Prepare the repository:
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   121
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   122
  $ hg init pubdiv2
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   123
  $ cd pubdiv2
4384
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   124
  $ for ch in a b; do
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   125
  >   echo $ch > $ch;
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   126
  >   hg ci -Aqm "added "$ch;
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   127
  > done;
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   128
  $ hg glog
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   129
  @  1:5f6d8a4bf34a added b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   130
  |   draft
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   131
  |
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   132
  o  0:9092f1db7931 added a
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   133
      draft
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   134
  
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   135
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   136
Make an amend and change phase to public:
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   137
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   138
  $ echo "I am foo" > b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   139
  $ hg amend
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   140
  $ hg phase --public
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   141
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   142
Amend again to create a cset divergent to public one:
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   143
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   144
  $ hg up 1 --hidden -q
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   145
  updated to hidden changeset 5f6d8a4bf34a
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   146
  (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c)
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   147
  working directory parent is obsolete! (5f6d8a4bf34a)
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   148
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   149
  $ echo "I am bar" > b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   150
  $ hg ci --amend -m "updated b"
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   151
  1 new content-divergent changesets
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   152
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   153
  $ hg glog
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   154
  @  3:0e805383168e updated b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   155
  |   draft content-divergent
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   156
  |
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   157
  | o  2:580f2d01e52c added b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   158
  |/    public
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   159
  |
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   160
  o  0:9092f1db7931 added a
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   161
      public
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   162
  
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   163
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   164
Lets resolve the divergence:
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   165
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   166
  $ hg evolve --content-divergent
4413
2360a1e050a6 evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4412
diff changeset
   167
  merge:[2] added b
2360a1e050a6 evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4412
diff changeset
   168
  with: [3] updated b
4384
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   169
  base: [1] added b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   170
  merging b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   171
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   172
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4660
diff changeset
   173
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4660
diff changeset
   174
  (see 'hg help evolve.interrupted')
4384
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   175
  [1]
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   176
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   177
  $ echo "I am foobar" > b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   178
  $ hg resolve -m --tool union
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   179
  (no more unresolved files)
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   180
  continue: hg evolve --continue
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   181
  $ hg evolve --continue
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   182
  committed as 1a739394e9d4
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   183
  working directory is now at 1a739394e9d4
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   184
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   185
  $ hg glog
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   186
  @  5:1a739394e9d4 phase-divergent update to 580f2d01e52c:
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   187
  |   draft
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   188
  |
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   189
  o  2:580f2d01e52c added b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   190
  |   public
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   191
  |
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   192
  o  0:9092f1db7931 added a
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   193
      public
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   194
  
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   195
Testing when different parent, no conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   196
-------------------------------------------
4385
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   197
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   198
  $ hg init pubdiv3
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   199
  $ cd pubdiv3
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   200
  $ for ch in a b c d; do
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   201
  >   echo $ch > $ch;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   202
  >   hg ci -Aqm "added "$ch;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   203
  > done;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   204
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   205
  $ hg up .^
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   206
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   207
  $ echo dd > d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   208
  $ hg add d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   209
  $ hg ci -m "added d"
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   210
  created new head
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   211
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   212
  $ hg up 1
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   213
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   214
  $ echo dd > d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   215
  $ echo e > e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   216
  $ hg add d e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   217
  $ hg ci -m "added d e"
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   218
  created new head
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   219
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   220
  $ hg glog
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   221
  @  5:4291d72ee19a added d e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   222
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   223
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   224
  | o  4:93cd84bbdaca added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   225
  | |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   226
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   227
  | | o  3:9150fe93bec6 added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   228
  | |/    draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   229
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   230
  | o  2:155349b645be added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   231
  |/    draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   232
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   233
  o  1:5f6d8a4bf34a added b
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   234
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   235
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   236
  o  0:9092f1db7931 added a
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   237
      draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   238
  
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   239
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   240
  $ hg prune 3 -s 5
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   241
  1 changesets pruned
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   242
  $ hg prune 3 -s 4 --hidden
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   243
  1 changesets pruned
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   244
  2 new content-divergent changesets
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   245
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   246
Change phase to public for one head:
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   247
  $ hg phase -r 4 --public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   248
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   249
  $ hg glog
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   250
  @  5:4291d72ee19a added d e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   251
  |   draft content-divergent
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   252
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   253
  | o  4:93cd84bbdaca added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   254
  | |   public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   255
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   256
  | o  2:155349b645be added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   257
  |/    public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   258
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   259
  o  1:5f6d8a4bf34a added b
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   260
  |   public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   261
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   262
  o  0:9092f1db7931 added a
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   263
      public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   264
  
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   265
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   266
  $ hg evolve --content-divergent --any
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   267
  merge:[4] added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   268
  with: [5] added d e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   269
  base: [3] added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   270
  rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   271
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   272
  committed as 4cbe48a0c3d9
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   273
  working directory is now at 4cbe48a0c3d9
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   274
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   275
  $ hg glog -l 1
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   276
  @  8:4cbe48a0c3d9 phase-divergent update to 93cd84bbdaca:
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   277
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   278
  ~
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   279
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   280
  $ hg evolve -l
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   281
  $ cd ..
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   282
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   283
Testing when different parents, relocation conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   284
----------------------------------------------------
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   285
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   286
  $ hg init pubdiv4
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   287
  $ cd pubdiv4
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   288
  $ for ch in a b c d; do
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   289
  >   echo $ch > $ch;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   290
  >   hg ci -Aqm "added "$ch;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   291
  > done;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   292
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   293
  $ hg up .^^
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   294
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   295
  $ echo d > d
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   296
  $ echo cfoo > c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   297
  $ echo e > e
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   298
  $ hg add d c e
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   299
  $ hg ci -m "added d c e"
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   300
  created new head
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   301
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   302
  $ hg up 'desc("added c")'
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   303
  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   304
  $ echo dd > d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   305
  $ hg add d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   306
  $ hg ci -m "added d"
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   307
  created new head
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   308
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   309
  $ hg glog
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   310
  @  5:93cd84bbdaca added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   311
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   312
  |
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   313
  | o  4:f31bcc378766 added d c e
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   314
  | |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   315
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   316
  +---o  3:9150fe93bec6 added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   317
  | |     draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   318
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   319
  o |  2:155349b645be added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   320
  |/    draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   321
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   322
  o  1:5f6d8a4bf34a added b
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   323
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   324
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   325
  o  0:9092f1db7931 added a
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   326
      draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   327
  
4473
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   328
  $ hg prune 'min(desc("re:added d$"))' -s 'max(desc("re:added d$"))'
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   329
  1 changesets pruned
4473
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   330
  $ hg prune 'min(desc("re:added d$"))' -s 'desc("added d c e")' --hidden
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   331
  1 changesets pruned
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   332
  2 new content-divergent changesets
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   333
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   334
Change phase to public for one head:
4473
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   335
  $ hg phase --public -r 'max(desc("re:added d$"))'
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   336
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   337
  $ hg glog
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   338
  @  5:93cd84bbdaca added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   339
  |   public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   340
  |
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   341
  | *  4:f31bcc378766 added d c e
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   342
  | |   draft content-divergent
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   343
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   344
  o |  2:155349b645be added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   345
  |/    public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   346
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   347
  o  1:5f6d8a4bf34a added b
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   348
  |   public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   349
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   350
  o  0:9092f1db7931 added a
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   351
      public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   352
  
4576
96ce1030d2fb tests: add --update to hg evolve to reduce test changes for the next patch
Anton Shestakov <av6@dwimlabs.net>
parents: 4530
diff changeset
   353
  $ hg evolve --content-divergent --any --update
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   354
  merge:[5] added d
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   355
  with: [4] added d c e
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   356
  base: [3] added d
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   357
  rebasing "other" content-divergent changeset f31bcc378766 on 155349b645be
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   358
  merging c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   359
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4660
diff changeset
   360
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4660
diff changeset
   361
  (see 'hg help evolve.interrupted')
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   362
  [1]
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   363
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   364
  $ hg diff
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   365
  diff -r 155349b645be c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   366
  --- a/c	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   367
  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   368
  @@ -1,1 +1,5 @@
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   369
  +<<<<<<< destination: 155349b645be - test: added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   370
   c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   371
  +=======
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   372
  +cfoo
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   373
  +>>>>>>> evolving:    f31bcc378766 - test: added d c e
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   374
  diff -r 155349b645be d
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   375
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   376
  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   377
  @@ -0,0 +1,1 @@
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   378
  +d
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   379
  diff -r 155349b645be e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   380
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   381
  +++ b/e	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   382
  @@ -0,0 +1,1 @@
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   383
  +e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   384
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   385
  $ echo c > c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   386
  $ hg res -m
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   387
  (no more unresolved files)
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   388
  continue: hg evolve --continue
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   389
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   390
  $ hg evolve --continue
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   391
  evolving 4:f31bcc378766 "added d c e"
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   392
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   393
  committed as 412dde898967
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   394
  working directory is now at 412dde898967
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   395
  $ hg export
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   396
  # HG changeset patch
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   397
  # User test
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   398
  # Date 0 0
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   399
  #      Thu Jan 01 00:00:00 1970 +0000
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   400
  # Node ID 412dde898967b50e7d334aefff778a9af46d29d1
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   401
  # Parent  93cd84bbdacaeb8f881c29a609dbdd30c38cbc57
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   402
  phase-divergent update to 93cd84bbdaca:
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   403
  
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   404
  added d c e
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   405
  
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   406
  diff -r 93cd84bbdaca -r 412dde898967 e
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   407
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   408
  +++ b/e	Thu Jan 01 00:00:00 1970 +0000
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   409
  @@ -0,0 +1,1 @@
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   410
  +e
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   411
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   412
  $ hg evolve -l
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   413
  $ cd ..
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   414
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   415
Testing when merging conflicts, relocation don't:
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   416
-------------------------------------------------
4418
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   417
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   418
  $ hg init pubdiv5
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   419
  $ cd pubdiv5
4418
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   420
  $ for ch in a b c d; do
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   421
  >   echo $ch > $ch;
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   422
  >   hg ci -Aqm "added "$ch;
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   423
  > done;
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   424
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   425
  $ hg up .^^
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   426
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   427
  $ echo dconflict > d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   428
  $ hg add d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   429
  $ hg ci -m "added d"
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   430
  created new head
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   431
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   432
  $ hg up 2
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   433
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   434
  $ echo dd > d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   435
  $ hg add d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   436
  $ hg ci -m "added d"
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   437
  created new head
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   438
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   439
  $ hg glog
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   440
  @  5:93cd84bbdaca added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   441
  |   draft
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   442
  |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   443
  | o  4:9411ad1fe615 added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   444
  | |   draft
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   445
  | |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   446
  +---o  3:9150fe93bec6 added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   447
  | |     draft
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   448
  | |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   449
  o |  2:155349b645be added c
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   450
  |/    draft
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   451
  |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   452
  o  1:5f6d8a4bf34a added b
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   453
  |   draft
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   454
  |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   455
  o  0:9092f1db7931 added a
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   456
      draft
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   457
  
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   458
  $ hg prune 3 -s 5
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   459
  1 changesets pruned
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   460
  $ hg prune 3 -s 4 --hidden
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   461
  1 changesets pruned
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   462
  2 new content-divergent changesets
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   463
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   464
Change phase to public for one head:
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   465
  $ hg phase --public -r 5
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   466
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   467
  $ hg glog
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   468
  @  5:93cd84bbdaca added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   469
  |   public
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   470
  |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   471
  | *  4:9411ad1fe615 added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   472
  | |   draft content-divergent
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   473
  | |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   474
  o |  2:155349b645be added c
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   475
  |/    public
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   476
  |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   477
  o  1:5f6d8a4bf34a added b
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   478
  |   public
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   479
  |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   480
  o  0:9092f1db7931 added a
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   481
      public
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   482
  
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   483
  $ hg evolve --content-divergent --any
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   484
  merge:[5] added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   485
  with: [4] added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   486
  base: [3] added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   487
  rebasing "other" content-divergent changeset 9411ad1fe615 on 155349b645be
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   488
  merging d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   489
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   490
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4660
diff changeset
   491
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4660
diff changeset
   492
  (see 'hg help evolve.interrupted')
4418
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   493
  [1]
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   494
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   495
  $ echo d > d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   496
  $ hg res -m
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   497
  (no more unresolved files)
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   498
  continue: hg evolve --continue
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   499
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   500
  $ hg evolve --continue
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   501
  committed as 2a0f44767904
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   502
  working directory is now at 93cd84bbdaca
4418
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   503
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   504
  $ hg evolve -l
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   505
  $ cd ..
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   506
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   507
Testing when relocation, merging both conflict:
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   508
-----------------------------------------------
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   509
4530
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   510
  $ hg init pubdiv6
d081cc4f5fef tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4473
diff changeset
   511
  $ cd pubdiv6
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   512
  $ for ch in a b c d; do
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   513
  >   echo $ch > $ch;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   514
  >   hg ci -Aqm "added "$ch;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   515
  > done;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   516
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   517
  $ hg up .^^
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   518
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   519
  $ echo cfoo > c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   520
  $ echo e > e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   521
  $ echo dconflict > d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   522
  $ hg add c e d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   523
  $ hg ci -m "added c e"
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   524
  created new head
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   525
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   526
  $ hg up 2
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   527
  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   528
  $ echo dd > d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   529
  $ hg add d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   530
  $ hg ci -m "added d"
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   531
  created new head
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   532
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   533
  $ hg glog
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   534
  @  5:93cd84bbdaca added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   535
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   536
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   537
  | o  4:3c17c7afaf6e added c e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   538
  | |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   539
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   540
  +---o  3:9150fe93bec6 added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   541
  | |     draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   542
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   543
  o |  2:155349b645be added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   544
  |/    draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   545
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   546
  o  1:5f6d8a4bf34a added b
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   547
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   548
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   549
  o  0:9092f1db7931 added a
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   550
      draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   551
  
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   552
  $ hg prune 3 -s 5
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   553
  1 changesets pruned
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   554
  $ hg prune 3 -s 4 --hidden
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   555
  1 changesets pruned
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   556
  2 new content-divergent changesets
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   557
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   558
Change phase to public for one head:
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   559
  $ hg phase --public -r 5
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   560
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   561
  $ hg glog
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   562
  @  5:93cd84bbdaca added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   563
  |   public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   564
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   565
  | *  4:3c17c7afaf6e added c e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   566
  | |   draft content-divergent
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   567
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   568
  o |  2:155349b645be added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   569
  |/    public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   570
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   571
  o  1:5f6d8a4bf34a added b
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   572
  |   public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   573
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   574
  o  0:9092f1db7931 added a
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   575
      public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   576
  
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   577
  $ hg evolve --content-divergent --any
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   578
  merge:[5] added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   579
  with: [4] added c e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   580
  base: [3] added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   581
  rebasing "other" content-divergent changeset 3c17c7afaf6e on 155349b645be
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   582
  merging c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   583
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4660
diff changeset
   584
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4660
diff changeset
   585
  (see 'hg help evolve.interrupted')
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   586
  [1]
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   587
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   588
  $ hg diff
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   589
  diff -r 155349b645be c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   590
  --- a/c	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   591
  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   592
  @@ -1,1 +1,5 @@
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   593
  +<<<<<<< destination: 155349b645be - test: added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   594
   c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   595
  +=======
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   596
  +cfoo
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   597
  +>>>>>>> evolving:    3c17c7afaf6e - test: added c e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   598
  diff -r 155349b645be d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   599
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   600
  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   601
  @@ -0,0 +1,1 @@
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   602
  +dconflict
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   603
  diff -r 155349b645be e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   604
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   605
  +++ b/e	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   606
  @@ -0,0 +1,1 @@
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   607
  +e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   608
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   609
  $ echo cfoo > c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   610
  $ hg res -m
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   611
  (no more unresolved files)
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   612
  continue: hg evolve --continue
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   613
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   614
  $ hg evolve --continue
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   615
  evolving 4:3c17c7afaf6e "added c e"
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   616
  merging d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   617
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   618
  2 files updated, 0 files merged, 0 files removed, 1 files unresolved
4676
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4660
diff changeset
   619
  unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents: 4660
diff changeset
   620
  (see 'hg help evolve.interrupted')
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   621
  [1]
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   622
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   623
  $ echo d > d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   624
  $ hg res -m
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   625
  (no more unresolved files)
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   626
  continue: hg evolve --continue
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   627
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   628
  $ hg evolve --continue
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   629
  committed as b9082a9e66ce
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   630
  working directory is now at 93cd84bbdaca
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   631
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   632
  $ hg evolve -l
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   633
  $ cd ..