Mercurial > evolve

comparison tests/test-evolve-content-divergent-basic.t @ 4492:91e0d05e06c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: clarify changeset concent in the first content-divergence test
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 10 Apr 2019 17:29:40 +0200
parents 7a5c6109ee84
children 32446b7a6e7c
comparison
equal deleted inserted replaced
4491:bdaf34903430 4492:91e0d05e06c6
41 $ cd test1 41 $ cd test1
42 $ echo a > a 42 $ echo a > a
43 $ hg ci -Aqm "added a" 43 $ hg ci -Aqm "added a"
44 $ echo b > b 44 $ echo b > b
45 $ hg ci -Aqm "added b" 45 $ hg ci -Aqm "added b"
46 $ hg export
47 # HG changeset patch
48 # User test
49 # Date 0 0
50 # Thu Jan 01 00:00:00 1970 +0000
51 # Node ID 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d
52 # Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318
53 added b
54
55 diff --git a/b b/b
56 new file mode 100644
57 --- /dev/null
58 +++ b/b
59 @@ -0,0 +1,1 @@
60 +b
46 61
47 $ hg up .^ 62 $ hg up .^
48 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 63 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
49 $ echo bdivergent > bdivergent1 64 $ echo bdivergent > bdivergent1
50 $ hg ci -Am "divergent" 65 $ hg ci -Am "divergent"
51 adding bdivergent1 66 adding bdivergent1
52 created new head 67 created new head
68 $ hg export
69 # HG changeset patch
70 # User test
71 # Date 0 0
72 # Thu Jan 01 00:00:00 1970 +0000
73 # Node ID 593c57f2117e33dd0884382f02789d948f548557
74 # Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318
75 divergent
76
77 diff --git a/bdivergent1 b/bdivergent1
78 new file mode 100644
79 --- /dev/null
80 +++ b/bdivergent1
81 @@ -0,0 +1,1 @@
82 +bdivergent
53 83
54 $ hg up .^ 84 $ hg up .^
55 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 85 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
56 $ echo bdivergent > bdivergent2 86 $ echo bdivergent > bdivergent2
57 $ hg ci -Am "divergent" 87 $ hg ci -Am "divergent"
58 adding bdivergent2 88 adding bdivergent2
59 created new head 89 created new head
90 $ hg export
91 # HG changeset patch
92 # User test
93 # Date 0 0
94 # Thu Jan 01 00:00:00 1970 +0000
95 # Node ID 8374d2ddc3a4d48428c3d2f80e4fc86f13736f96
96 # Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318
97 divergent
98
99 diff --git a/bdivergent2 b/bdivergent2
100 new file mode 100644
101 --- /dev/null
102 +++ b/bdivergent2
103 @@ -0,0 +1,1 @@
104 +bdivergent
60 105
61 $ hg prune -s 8374d2ddc3a4 "desc('added b')" 106 $ hg prune -s 8374d2ddc3a4 "desc('added b')"
62 1 changesets pruned 107 1 changesets pruned
63 $ hg prune -s 593c57f2117e "desc('added b')" --hidden 108 $ hg prune -s 593c57f2117e "desc('added b')" --hidden
64 1 changesets pruned 109 1 changesets pruned
65 2 new content-divergent changesets 110 2 new content-divergent changesets
66 111
67 $ hg log -G 112 $ hg log -G --patch
68 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] 113 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent]
114 | diff --git a/bdivergent2 b/bdivergent2
115 | new file mode 100644
116 | --- /dev/null
117 | +++ b/bdivergent2
118 | @@ -0,0 +1,1 @@
119 | +bdivergent
69 | 120 |
70 | * 2:593c57f2117e@default(draft) divergent [content-divergent] 121 | * 2:593c57f2117e@default(draft) divergent [content-divergent]
71 |/ 122 |/ diff --git a/bdivergent1 b/bdivergent1
123 | new file mode 100644
124 | --- /dev/null
125 | +++ b/bdivergent1
126 | @@ -0,0 +1,1 @@
127 | +bdivergent
128 |
72 o 0:9092f1db7931@default(draft) added a [] 129 o 0:9092f1db7931@default(draft) added a []
130 diff --git a/a b/a
131 new file mode 100644
132 --- /dev/null
133 +++ b/a
134 @@ -0,0 +1,1 @@
135 +a
73 136
74 137
75 $ hg evolve --all --any --content-divergent 138 $ hg evolve --all --any --content-divergent
76 merge:[2] divergent 139 merge:[2] divergent
77 with: [3] divergent 140 with: [3] divergent
83 $ hg log -G 146 $ hg log -G
84 @ 4:45bf1312f454@default(draft) divergent [] 147 @ 4:45bf1312f454@default(draft) divergent []
85 | 148 |
86 o 0:9092f1db7931@default(draft) added a [] 149 o 0:9092f1db7931@default(draft) added a []
87 150
151 $ hg export
152 # HG changeset patch
153 # User test
154 # Date 0 0
155 # Thu Jan 01 00:00:00 1970 +0000
156 # Node ID 45bf1312f45468b76158b33f8426e6530c8b35b1
157 # Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318
158 divergent
159
160 diff --git a/bdivergent1 b/bdivergent1
161 new file mode 100644
162 --- /dev/null
163 +++ b/bdivergent1
164 @@ -0,0 +1,1 @@
165 +bdivergent
166 diff --git a/bdivergent2 b/bdivergent2
167 new file mode 100644
168 --- /dev/null
169 +++ b/bdivergent2
170 @@ -0,0 +1,1 @@
171 +bdivergent
88 172
89 $ cd .. 173 $ cd ..
90 174
91 Extra setup 175 Extra setup
92 ----------- 176 -----------