95 parent: 1:1740ad2a1eda |
95 parent: 1:1740ad2a1eda |
96 user: foo <foo@test.com> |
96 user: foo <foo@test.com> |
97 date: Thu Jan 01 00:00:00 1970 +0000 |
97 date: Thu Jan 01 00:00:00 1970 +0000 |
98 summary: added c e |
98 summary: added c e |
99 |
99 |
|
100 $ cd .. |
|
101 |
|
102 Testing the three way merge logic for user of content divergent changesets |
|
103 -------------------------------------------------------------------------- |
|
104 |
|
105 $ hg init mergeusers |
|
106 $ cd mergeusers |
|
107 $ for ch in a b c; do |
|
108 > touch $ch |
|
109 > hg add $ch |
|
110 > hg ci -m "added "$ch |
|
111 > done; |
|
112 |
|
113 $ hg amend -m "updated c" |
|
114 $ hg up -r 'desc("added c")' --hidden -q |
|
115 updated to hidden changeset 2b3c31fe982d |
|
116 (hidden revision '2b3c31fe982d' was rewritten as: 464e35020fd0) |
|
117 working directory parent is obsolete! (2b3c31fe982d) |
|
118 $ echo coco > c |
|
119 |
|
120 1) when one user is different wrt base |
|
121 -------------------------------------- |
|
122 |
|
123 Insert a diverging author name: |
|
124 $ hg amend -u 'foouser' |
|
125 2 new content-divergent changesets |
|
126 |
|
127 Run automatic evolution: |
|
128 $ hg evolve --content-divergent |
|
129 merge:[3] updated c |
|
130 with: [4] added c |
|
131 base: [2] added c |
|
132 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
133 working directory is now at 932d6ceb7672 |
|
134 |
|
135 $ hg log -r tip | grep "^user" |
|
136 user: foouser |
|
137 |
|
138 $ hg strip . -q --config extensions.strip= |
|
139 2 new content-divergent changesets |
|
140 |
|
141 2) when both the user are different wrt base |
|
142 -------------------------------------------- |
|
143 |
|
144 $ hg up -r 'max(desc("updated c"))' |
|
145 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
146 $ hg amend -u 'baruser' |
|
147 |
|
148 Run automatic evolution: |
|
149 $ hg evolve --content-divergent |
|
150 merge:[4] added c |
|
151 with: [5] updated c |
|
152 base: [2] added c |
|
153 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
154 working directory is now at 85c4e0b92028 |
|
155 |
|
156 $ hg log -r tip | grep "^user" |
|
157 user: baruser |
|
158 |
|
159 $ cd .. |