132 parent: 4:64370c9805e7 |
132 parent: 4:64370c9805e7 |
133 user: test |
133 user: test |
134 date: Thu Jan 01 00:00:00 1970 +0000 |
134 date: Thu Jan 01 00:00:00 1970 +0000 |
135 summary: merging a and b |
135 summary: merging a and b |
136 |
136 |
|
137 |
|
138 Clean up to prepare for next test case |
|
139 $ hg prune -r 64370c9805e7 -r 3d41537b44ca -r 968d205ba4d8 |
|
140 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
141 working directory is now at 8fa14d15e168 |
|
142 3 changesets pruned |
|
143 |
137 2) When merging both the parents resulted in conflicts |
144 2) When merging both the parents resulted in conflicts |
138 ------------------------------------------------------ |
145 ------------------------------------------------------ |
139 |
146 |
140 $ hg up 8fa14d15e168 |
147 $ hg up 8fa14d15e168 |
141 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
148 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
142 $ echo foo > c |
149 $ echo foo > c |
143 $ hg ci -Aqm "foo to c" |
150 $ hg ci -Aqm "foo to c" |
144 $ hg prev |
151 $ hg prev |
145 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
152 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
146 [0] added hgignore |
153 [0] added hgignore |
147 $ echo bar > c |
154 $ echo bar > c |
148 $ hg ci -Aqm "bar to c" |
155 $ hg ci -Aqm "bar to c" |
149 |
|
150 $ hg glog |
|
151 @ 9:d0f84b25d4e3 bar to c |
|
152 | () draft |
|
153 | o 8:1c165c673853 foo to c |
|
154 |/ () draft |
|
155 | o 7:968d205ba4d8 merging a and b |
|
156 | |\ () draft |
|
157 +---o 6:3d41537b44ca added a |
|
158 | | () draft |
|
159 | o 4:64370c9805e7 added b |
|
160 |/ () draft |
|
161 o 0:8fa14d15e168 added hgignore |
|
162 () draft |
|
163 |
|
164 Prune old test changesets to have clear graph view |
|
165 $ hg prune -r 64370c9805e7 -r 3d41537b44ca -r 968d205ba4d8 |
|
166 3 changesets pruned |
|
167 |
156 |
168 $ hg glog |
157 $ hg glog |
169 @ 9:d0f84b25d4e3 bar to c |
158 @ 9:d0f84b25d4e3 bar to c |
170 | () draft |
159 | () draft |
171 | o 8:1c165c673853 foo to c |
160 | o 8:1c165c673853 foo to c |