author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Wed, 24 Apr 2019 14:38:26 +0200 | |
changeset 4574 | 5e8c47c553db |
parent 4530 | d081cc4f5fef |
child 4576 | 96ce1030d2fb |
permissions | -rw-r--r-- |
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] |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
15 |
> glog = log -GT "{rev}:{node|short} {desc|firstline}\n {phase} {troubles}\n\n" |
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 |
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
|
76 |
updating to "local" side of the conflict: 44f360db368f |
2360a1e050a6
evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4412
diff
changeset
|
77 |
merging "other" content-divergent changeset 'dcdaf152280a' |
4383
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
78 |
merging b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
79 |
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
|
80 |
committed as c1aa9cfb6cf8 |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
81 |
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
|
82 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
83 |
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
|
84 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
85 |
$ hg glog -p |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
86 |
@ 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
|
87 |
| draft |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
88 |
| |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
89 |
| 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
|
90 |
| --- 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
|
91 |
| +++ 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
|
92 |
| @@ -1,2 +1,3 @@ |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
93 |
| I am first |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
94 |
| b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
95 |
| +I am second |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
96 |
| |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
97 |
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
|
98 |
| public |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
99 |
| |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
100 |
| 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
|
101 |
| --- /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
|
102 |
| +++ 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
|
103 |
| @@ -0,0 +1,2 @@ |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
104 |
| +I am first |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
105 |
| +b |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
106 |
| |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
107 |
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
|
108 |
public |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
109 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
110 |
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
|
111 |
--- /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
|
112 |
+++ 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
|
113 |
@@ -0,0 +1,1 @@ |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
114 |
+a |
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
115 |
|
3343eac099ec
evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff
changeset
|
116 |
$ 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
|
117 |
$ cd .. |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
118 |
|
4530
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
119 |
Testing when same parent, merging conflict: |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
120 |
------------------------------------------- |
4384
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
121 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
122 |
Prepare the repository: |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
123 |
|
4530
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
124 |
$ hg init pubdiv2 |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
125 |
$ cd pubdiv2 |
4384
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
126 |
$ 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
|
127 |
> echo $ch > $ch; |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
128 |
> 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
|
129 |
> done; |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
130 |
$ hg glog |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
131 |
@ 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
|
132 |
| draft |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
133 |
| |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
134 |
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
|
135 |
draft |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
136 |
|
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 |
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
|
139 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
140 |
$ 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
|
141 |
$ hg amend |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
142 |
$ hg phase --public |
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 |
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
|
145 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
146 |
$ 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
|
147 |
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
|
148 |
(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
|
149 |
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
|
150 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
151 |
$ 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
|
152 |
$ 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
|
153 |
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
|
154 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
155 |
$ hg glog |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
156 |
@ 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
|
157 |
| draft content-divergent |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
158 |
| |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
159 |
| 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
|
160 |
|/ public |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
161 |
| |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
162 |
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
|
163 |
public |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
164 |
|
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 |
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
|
167 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
168 |
$ 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
|
169 |
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
|
170 |
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
|
171 |
base: [1] added b |
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
|
172 |
updating to "local" side of the conflict: 580f2d01e52c |
2360a1e050a6
evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4412
diff
changeset
|
173 |
merging "other" content-divergent changeset '0e805383168e' |
4384
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
174 |
merging b |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
175 |
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
|
176 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
177 |
fix conflicts and see `hg help evolve.interrupted` |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
178 |
[1] |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
179 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
180 |
$ 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
|
181 |
$ 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
|
182 |
(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
|
183 |
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
|
184 |
$ hg evolve --continue |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
185 |
committed as 1a739394e9d4 |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
186 |
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
|
187 |
|
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
188 |
$ hg glog |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
189 |
@ 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
|
190 |
| draft |
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 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
|
193 |
| public |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
194 |
| |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
195 |
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
|
196 |
public |
8993fd4805d0
evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4383
diff
changeset
|
197 |
|
4530
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
198 |
Testing when different parent, no conflict: |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
199 |
------------------------------------------- |
4385
34322fb3afca
evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4384
diff
changeset
|
200 |
|
4530
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
201 |
$ hg init pubdiv3 |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
202 |
$ cd pubdiv3 |
4412
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
203 |
$ 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
|
204 |
> echo $ch > $ch; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
205 |
> hg ci -Aqm "added "$ch; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
206 |
> done; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
207 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
208 |
$ hg up .^ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
209 |
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
|
210 |
$ echo dd > d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
211 |
$ hg add d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
212 |
$ hg ci -m "added d" |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
213 |
created new head |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
214 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
215 |
$ hg up 1 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
216 |
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
|
217 |
$ echo dd > d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
218 |
$ echo e > e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
219 |
$ hg add d e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
220 |
$ 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
|
221 |
created new head |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
222 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
223 |
$ hg glog |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
224 |
@ 5:4291d72ee19a added d e |
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 4:93cd84bbdaca 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 3:9150fe93bec6 added d |
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 2:155349b645be added c |
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 1:5f6d8a4bf34a added b |
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 |
o 0:9092f1db7931 added a |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
240 |
draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
241 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
242 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
243 |
$ hg prune 3 -s 5 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
244 |
1 changesets pruned |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
245 |
$ 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
|
246 |
1 changesets pruned |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
247 |
2 new content-divergent changesets |
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 |
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
|
250 |
$ hg phase -r 4 --public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
251 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
252 |
$ hg glog |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
253 |
@ 5:4291d72ee19a added d e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
254 |
| draft content-divergent |
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 4:93cd84bbdaca added d |
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 2:155349b645be added c |
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 1:5f6d8a4bf34a added b |
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 |
o 0:9092f1db7931 added a |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
266 |
public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
267 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
268 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
269 |
$ hg evolve --content-divergent --any |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
270 |
merge:[4] added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
271 |
with: [5] added d e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
272 |
base: [3] added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
273 |
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
|
274 |
updating to "local" side of the conflict: 93cd84bbdaca |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
275 |
merging "other" content-divergent changeset 'f88581407163' |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
276 |
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
|
277 |
committed as 4cbe48a0c3d9 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
278 |
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
|
279 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
280 |
$ hg glog -l 1 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
281 |
@ 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
|
282 |
| draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
283 |
~ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
284 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
285 |
$ hg evolve -l |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
286 |
$ cd .. |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
287 |
|
4530
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
288 |
Testing when different parents, relocation conflict: |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
289 |
---------------------------------------------------- |
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
|
290 |
|
4530
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
291 |
$ hg init pubdiv4 |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
292 |
$ cd pubdiv4 |
4412
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
293 |
$ 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
|
294 |
> echo $ch > $ch; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
295 |
> hg ci -Aqm "added "$ch; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
296 |
> done; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
297 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
298 |
$ hg up .^^ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
299 |
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
|
300 |
$ echo d > d |
4412
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
301 |
$ echo cfoo > c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
302 |
$ 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
|
303 |
$ 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
|
304 |
$ 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
|
305 |
created new head |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
306 |
|
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
|
307 |
$ 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
|
308 |
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
|
309 |
$ echo dd > d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
310 |
$ hg add d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
311 |
$ hg ci -m "added d" |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
312 |
created new head |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
313 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
314 |
$ hg glog |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
315 |
@ 5:93cd84bbdaca added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
316 |
| draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
317 |
| |
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
|
318 |
| 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
|
319 |
| | draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
320 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
321 |
+---o 3:9150fe93bec6 added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
322 |
| | draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
323 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
324 |
o | 2:155349b645be added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
325 |
|/ draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
326 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
327 |
o 1:5f6d8a4bf34a added b |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
328 |
| draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
329 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
330 |
o 0:9092f1db7931 added a |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
331 |
draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
332 |
|
4473
14437b18b024
evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4472
diff
changeset
|
333 |
$ 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
|
334 |
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
|
335 |
$ 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
|
336 |
1 changesets pruned |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
337 |
2 new content-divergent changesets |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
338 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
339 |
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
|
340 |
$ 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
|
341 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
342 |
$ hg glog |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
343 |
@ 5:93cd84bbdaca added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
344 |
| public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
345 |
| |
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
|
346 |
| * 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
|
347 |
| | draft content-divergent |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
348 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
349 |
o | 2:155349b645be added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
350 |
|/ public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
351 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
352 |
o 1:5f6d8a4bf34a added b |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
353 |
| public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
354 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
355 |
o 0:9092f1db7931 added a |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
356 |
public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
357 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
358 |
$ hg evolve --content-divergent --any |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
359 |
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
|
360 |
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
|
361 |
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
|
362 |
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
|
363 |
merging c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
364 |
warning: conflicts while merging c! (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
|
365 |
fix conflicts and see `hg help evolve.interrupted` |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
366 |
[1] |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
367 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
368 |
$ hg diff |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
369 |
diff -r 155349b645be c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
370 |
--- 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
|
371 |
+++ 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
|
372 |
@@ -1,1 +1,5 @@ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
373 |
+<<<<<<< destination: 155349b645be - test: added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
374 |
c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
375 |
+======= |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
376 |
+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
|
377 |
+>>>>>>> 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
|
378 |
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
|
379 |
--- /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
|
380 |
+++ 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
|
381 |
@@ -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
|
382 |
+d |
4412
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
383 |
diff -r 155349b645be e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
384 |
--- /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
|
385 |
+++ 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
|
386 |
@@ -0,0 +1,1 @@ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
387 |
+e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
388 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
389 |
$ echo c > c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
390 |
$ hg res -m |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
391 |
(no more unresolved files) |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
392 |
continue: hg evolve --continue |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
393 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
394 |
$ 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
|
395 |
evolving 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
|
396 |
updating to "local" side of the conflict: 93cd84bbdaca |
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
|
397 |
merging "other" content-divergent changeset 'bd28d3e4a228' |
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 |
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
|
399 |
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
|
400 |
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
|
401 |
$ 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
|
402 |
# 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
|
403 |
# 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
|
404 |
# 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
|
405 |
# 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
|
406 |
# 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
|
407 |
# 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
|
408 |
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
|
409 |
|
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 |
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
|
411 |
|
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
|
412 |
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
|
413 |
--- /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
|
414 |
+++ 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
|
415 |
@@ -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
|
416 |
+e |
4412
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
417 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
418 |
$ hg evolve -l |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
419 |
$ cd .. |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
420 |
|
4530
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
421 |
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
|
422 |
------------------------------------------------- |
4418
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
423 |
|
4530
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
424 |
$ hg init pubdiv5 |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
425 |
$ 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
|
426 |
$ 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
|
427 |
> 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
|
428 |
> 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
|
429 |
> done; |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
430 |
|
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
431 |
$ hg up .^^ |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
432 |
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
|
433 |
$ 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
|
434 |
$ 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
|
435 |
$ 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
|
436 |
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
|
437 |
|
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
438 |
$ 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
|
439 |
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
|
440 |
$ 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
|
441 |
$ 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
|
442 |
$ 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
|
443 |
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
|
444 |
|
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
445 |
$ hg glog |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
446 |
@ 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
|
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 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
|
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 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
|
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 | 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
|
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 |
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
|
459 |
| draft |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
460 |
| |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
461 |
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
|
462 |
draft |
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 |
$ 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
|
465 |
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
|
466 |
$ 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
|
467 |
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
|
468 |
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
|
469 |
|
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
470 |
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
|
471 |
$ 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
|
472 |
|
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
473 |
$ hg glog |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
474 |
@ 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
|
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 |
| * 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
|
478 |
| | 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
|
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 | 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
|
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 |
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
|
484 |
| public |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
485 |
| |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
486 |
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
|
487 |
public |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
488 |
|
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
489 |
$ 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
|
490 |
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
|
491 |
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
|
492 |
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
|
493 |
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
|
494 |
updating to "local" side of the conflict: 93cd84bbdaca |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
495 |
merging "other" content-divergent changeset 'b5c690cdf1d5' |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
496 |
merging d |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
497 |
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
|
498 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
499 |
fix conflicts and see `hg help evolve.interrupted` |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
500 |
[1] |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
501 |
|
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
502 |
$ 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
|
503 |
$ 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
|
504 |
(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
|
505 |
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
|
506 |
|
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
507 |
$ 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
|
508 |
committed as 2a0f44767904 |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
509 |
working directory is now at 2a0f44767904 |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
510 |
|
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
511 |
$ 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
|
512 |
$ cd .. |
0ec30a7d9e12
evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4417
diff
changeset
|
513 |
|
4530
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
514 |
Testing when relocation, merging both conflict: |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
515 |
----------------------------------------------- |
4412
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
516 |
|
4530
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
517 |
$ hg init pubdiv6 |
d081cc4f5fef
tests: consolidate the public-content-divergent test cases
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4473
diff
changeset
|
518 |
$ cd pubdiv6 |
4412
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
519 |
$ 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
|
520 |
> echo $ch > $ch; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
521 |
> hg ci -Aqm "added "$ch; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
522 |
> done; |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
523 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
524 |
$ hg up .^^ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
525 |
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
|
526 |
$ echo cfoo > c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
527 |
$ echo e > e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
528 |
$ echo dconflict > d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
529 |
$ hg add c e 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 c e" |
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 up 2 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
534 |
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
|
535 |
$ echo dd > d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
536 |
$ hg add d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
537 |
$ hg ci -m "added d" |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
538 |
created new head |
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 |
$ hg glog |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
541 |
@ 5:93cd84bbdaca added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
542 |
| draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
543 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
544 |
| 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
|
545 |
| | draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
546 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
547 |
+---o 3:9150fe93bec6 added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
548 |
| | draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
549 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
550 |
o | 2:155349b645be added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
551 |
|/ draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
552 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
553 |
o 1:5f6d8a4bf34a added b |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
554 |
| draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
555 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
556 |
o 0:9092f1db7931 added a |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
557 |
draft |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
558 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
559 |
$ hg prune 3 -s 5 |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
560 |
1 changesets pruned |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
561 |
$ 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
|
562 |
1 changesets pruned |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
563 |
2 new content-divergent changesets |
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 |
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
|
566 |
$ hg phase --public -r 5 |
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 |
$ hg glog |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
569 |
@ 5:93cd84bbdaca added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
570 |
| public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
571 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
572 |
| * 4:3c17c7afaf6e added c e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
573 |
| | draft content-divergent |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
574 |
| | |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
575 |
o | 2:155349b645be added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
576 |
|/ public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
577 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
578 |
o 1:5f6d8a4bf34a added b |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
579 |
| public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
580 |
| |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
581 |
o 0:9092f1db7931 added a |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
582 |
public |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
583 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
584 |
$ hg evolve --content-divergent --any |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
585 |
merge:[5] added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
586 |
with: [4] added c e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
587 |
base: [3] added d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
588 |
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
|
589 |
merging c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
590 |
warning: conflicts while merging c! (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
|
591 |
fix conflicts and see `hg help evolve.interrupted` |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
592 |
[1] |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
593 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
594 |
$ hg diff |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
595 |
diff -r 155349b645be c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
596 |
--- 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
|
597 |
+++ 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
|
598 |
@@ -1,1 +1,5 @@ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
599 |
+<<<<<<< destination: 155349b645be - test: added c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
600 |
c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
601 |
+======= |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
602 |
+cfoo |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
603 |
+>>>>>>> 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
|
604 |
diff -r 155349b645be d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
605 |
--- /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
|
606 |
+++ 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
|
607 |
@@ -0,0 +1,1 @@ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
608 |
+dconflict |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
609 |
diff -r 155349b645be e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
610 |
--- /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
|
611 |
+++ 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
|
612 |
@@ -0,0 +1,1 @@ |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
613 |
+e |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
614 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
615 |
$ echo cfoo > c |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
616 |
$ hg res -m |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
617 |
(no more unresolved files) |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
618 |
continue: hg evolve --continue |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
619 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
620 |
$ hg evolve --continue |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
621 |
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
|
622 |
updating to "local" side of the conflict: 93cd84bbdaca |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
623 |
merging "other" content-divergent changeset 'c4ce3d34e784' |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
624 |
merging d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
625 |
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
|
626 |
2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
627 |
fix conflicts and see `hg help evolve.interrupted` |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
628 |
[1] |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
629 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
630 |
$ echo d > d |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
631 |
$ hg res -m |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
632 |
(no more unresolved files) |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
633 |
continue: hg evolve --continue |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
634 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
635 |
$ hg evolve --continue |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
636 |
committed as b9082a9e66ce |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
637 |
working directory is now at b9082a9e66ce |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
638 |
|
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
639 |
$ hg evolve -l |
dcbe64c954dc
evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
4385
diff
changeset
|
640 |
$ cd .. |