140 # Notes: |
140 # Notes: |
141 # - local and remote changed content1_content2_*_content2-untracked |
141 # - local and remote changed content1_content2_*_content2-untracked |
142 # in the same way, so it could potentially be left alone |
142 # in the same way, so it could potentially be left alone |
143 |
143 |
144 $ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1 |
144 $ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1 |
145 local [working copy] changed content1_missing_content1_content4-tracked which other [merge rev] deleted |
145 file content1_missing_content1_content4-tracked was deleted in local [working copy] but was modified in other [merge rev]. |
|
146 What do you want to do? |
146 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
147 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
147 local [working copy] changed content1_missing_content3_content3-tracked which other [merge rev] deleted |
148 file content1_missing_content3_content3-tracked was deleted in local [working copy] but was modified in other [merge rev]. |
|
149 What do you want to do? |
148 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
150 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
149 local [working copy] changed content1_missing_content3_content4-tracked which other [merge rev] deleted |
151 file content1_missing_content3_content4-tracked was deleted in local [working copy] but was modified in other [merge rev]. |
|
152 What do you want to do? |
150 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
153 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
151 local [working copy] changed content1_missing_missing_content4-tracked which other [merge rev] deleted |
154 file content1_missing_missing_content4-tracked was deleted in local [working copy] but was modified in other [merge rev]. |
|
155 What do you want to do? |
152 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
156 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
153 other [merge rev] changed content1_content2_content1_content1-untracked which local [working copy] deleted |
157 file content1_content2_content1_content1-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
154 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
158 What do you want to do? |
155 other [merge rev] changed content1_content2_content1_content2-untracked which local [working copy] deleted |
159 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
156 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
160 file content1_content2_content1_content2-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
157 other [merge rev] changed content1_content2_content1_content4-untracked which local [working copy] deleted |
161 What do you want to do? |
158 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
162 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
159 other [merge rev] changed content1_content2_content1_missing-tracked which local [working copy] deleted |
163 file content1_content2_content1_content4-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
160 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
164 What do you want to do? |
161 other [merge rev] changed content1_content2_content1_missing-untracked which local [working copy] deleted |
165 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
162 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
166 file content1_content2_content1_missing-tracked was deleted in other [merge rev] but was modified in local [working copy]. |
163 other [merge rev] changed content1_content2_content2_content1-untracked which local [working copy] deleted |
167 What do you want to do? |
164 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
168 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
165 other [merge rev] changed content1_content2_content2_content2-untracked which local [working copy] deleted |
169 file content1_content2_content1_missing-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
166 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
170 What do you want to do? |
167 other [merge rev] changed content1_content2_content2_content4-untracked which local [working copy] deleted |
171 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
168 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
172 file content1_content2_content2_content1-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
169 other [merge rev] changed content1_content2_content2_missing-tracked which local [working copy] deleted |
173 What do you want to do? |
170 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
174 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
171 other [merge rev] changed content1_content2_content2_missing-untracked which local [working copy] deleted |
175 file content1_content2_content2_content2-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
172 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
176 What do you want to do? |
173 other [merge rev] changed content1_content2_content3_content1-untracked which local [working copy] deleted |
177 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
174 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
178 file content1_content2_content2_content4-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
175 other [merge rev] changed content1_content2_content3_content2-untracked which local [working copy] deleted |
179 What do you want to do? |
176 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
180 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
177 other [merge rev] changed content1_content2_content3_content3-untracked which local [working copy] deleted |
181 file content1_content2_content2_missing-tracked was deleted in other [merge rev] but was modified in local [working copy]. |
178 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
182 What do you want to do? |
179 other [merge rev] changed content1_content2_content3_content4-untracked which local [working copy] deleted |
183 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
180 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
184 file content1_content2_content2_missing-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
181 other [merge rev] changed content1_content2_content3_missing-tracked which local [working copy] deleted |
185 What do you want to do? |
182 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
186 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
183 other [merge rev] changed content1_content2_content3_missing-untracked which local [working copy] deleted |
187 file content1_content2_content3_content1-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
184 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
188 What do you want to do? |
185 other [merge rev] changed content1_content2_missing_content1-untracked which local [working copy] deleted |
189 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
186 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
190 file content1_content2_content3_content2-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
187 other [merge rev] changed content1_content2_missing_content2-untracked which local [working copy] deleted |
191 What do you want to do? |
188 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
192 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
189 other [merge rev] changed content1_content2_missing_content4-untracked which local [working copy] deleted |
193 file content1_content2_content3_content3-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
190 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
194 What do you want to do? |
191 other [merge rev] changed content1_content2_missing_missing-tracked which local [working copy] deleted |
195 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
192 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
196 file content1_content2_content3_content4-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
193 other [merge rev] changed content1_content2_missing_missing-untracked which local [working copy] deleted |
197 What do you want to do? |
|
198 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
199 file content1_content2_content3_missing-tracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
200 What do you want to do? |
|
201 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
202 file content1_content2_content3_missing-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
203 What do you want to do? |
|
204 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
205 file content1_content2_missing_content1-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
206 What do you want to do? |
|
207 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
208 file content1_content2_missing_content2-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
209 What do you want to do? |
|
210 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
211 file content1_content2_missing_content4-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
212 What do you want to do? |
|
213 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
214 file content1_content2_missing_missing-tracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
215 What do you want to do? |
|
216 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
217 file content1_content2_missing_missing-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
218 What do you want to do? |
194 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
219 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
195 merging content1_content2_content1_content4-tracked |
220 merging content1_content2_content1_content4-tracked |
196 merging content1_content2_content2_content1-tracked |
221 merging content1_content2_content2_content1-tracked |
197 merging content1_content2_content2_content4-tracked |
222 merging content1_content2_content2_content4-tracked |
198 merging content1_content2_content3_content1-tracked |
223 merging content1_content2_content3_content1-tracked |
701 $ hg resolve --unmark --all |
726 $ hg resolve --unmark --all |
702 $ hg resolve --all --tool :local |
727 $ hg resolve --all --tool :local |
703 (no more unresolved files) |
728 (no more unresolved files) |
704 $ hg resolve --unmark --all |
729 $ hg resolve --unmark --all |
705 $ hg resolve --all --tool internal:merge3 |
730 $ hg resolve --all --tool internal:merge3 |
706 other [merge rev] changed content1_content2_content1_content1-untracked which local [working copy] deleted |
731 file content1_content2_content1_content1-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
707 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
732 What do you want to do? |
708 other [merge rev] changed content1_content2_content1_content2-untracked which local [working copy] deleted |
733 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
734 file content1_content2_content1_content2-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
735 What do you want to do? |
709 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
736 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
710 merging content1_content2_content1_content4-tracked |
737 merging content1_content2_content1_content4-tracked |
711 other [merge rev] changed content1_content2_content1_content4-untracked which local [working copy] deleted |
738 file content1_content2_content1_content4-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
712 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
739 What do you want to do? |
713 other [merge rev] changed content1_content2_content1_missing-tracked which local [working copy] deleted |
740 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
714 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
741 file content1_content2_content1_missing-tracked was deleted in other [merge rev] but was modified in local [working copy]. |
715 other [merge rev] changed content1_content2_content1_missing-untracked which local [working copy] deleted |
742 What do you want to do? |
|
743 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
744 file content1_content2_content1_missing-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
745 What do you want to do? |
716 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
746 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
717 merging content1_content2_content2_content1-tracked |
747 merging content1_content2_content2_content1-tracked |
718 other [merge rev] changed content1_content2_content2_content1-untracked which local [working copy] deleted |
748 file content1_content2_content2_content1-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
719 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
749 What do you want to do? |
720 other [merge rev] changed content1_content2_content2_content2-untracked which local [working copy] deleted |
750 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
751 file content1_content2_content2_content2-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
752 What do you want to do? |
721 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
753 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
722 merging content1_content2_content2_content4-tracked |
754 merging content1_content2_content2_content4-tracked |
723 other [merge rev] changed content1_content2_content2_content4-untracked which local [working copy] deleted |
755 file content1_content2_content2_content4-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
724 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
756 What do you want to do? |
725 other [merge rev] changed content1_content2_content2_missing-tracked which local [working copy] deleted |
757 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
726 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
758 file content1_content2_content2_missing-tracked was deleted in other [merge rev] but was modified in local [working copy]. |
727 other [merge rev] changed content1_content2_content2_missing-untracked which local [working copy] deleted |
759 What do you want to do? |
|
760 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
761 file content1_content2_content2_missing-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
762 What do you want to do? |
728 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
763 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
729 merging content1_content2_content3_content1-tracked |
764 merging content1_content2_content3_content1-tracked |
730 other [merge rev] changed content1_content2_content3_content1-untracked which local [working copy] deleted |
765 file content1_content2_content3_content1-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
731 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
766 What do you want to do? |
732 other [merge rev] changed content1_content2_content3_content2-untracked which local [working copy] deleted |
767 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
768 file content1_content2_content3_content2-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
769 What do you want to do? |
733 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
770 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
734 merging content1_content2_content3_content3-tracked |
771 merging content1_content2_content3_content3-tracked |
735 other [merge rev] changed content1_content2_content3_content3-untracked which local [working copy] deleted |
772 file content1_content2_content3_content3-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
773 What do you want to do? |
736 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
774 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
737 merging content1_content2_content3_content4-tracked |
775 merging content1_content2_content3_content4-tracked |
738 other [merge rev] changed content1_content2_content3_content4-untracked which local [working copy] deleted |
776 file content1_content2_content3_content4-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
739 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
777 What do you want to do? |
740 other [merge rev] changed content1_content2_content3_missing-tracked which local [working copy] deleted |
778 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
741 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
779 file content1_content2_content3_missing-tracked was deleted in other [merge rev] but was modified in local [working copy]. |
742 other [merge rev] changed content1_content2_content3_missing-untracked which local [working copy] deleted |
780 What do you want to do? |
|
781 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
782 file content1_content2_content3_missing-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
783 What do you want to do? |
743 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
784 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
744 merging content1_content2_missing_content1-tracked |
785 merging content1_content2_missing_content1-tracked |
745 other [merge rev] changed content1_content2_missing_content1-untracked which local [working copy] deleted |
786 file content1_content2_missing_content1-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
746 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
787 What do you want to do? |
747 other [merge rev] changed content1_content2_missing_content2-untracked which local [working copy] deleted |
788 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
789 file content1_content2_missing_content2-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
790 What do you want to do? |
748 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
791 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
749 merging content1_content2_missing_content4-tracked |
792 merging content1_content2_missing_content4-tracked |
750 other [merge rev] changed content1_content2_missing_content4-untracked which local [working copy] deleted |
793 file content1_content2_missing_content4-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
751 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
794 What do you want to do? |
752 other [merge rev] changed content1_content2_missing_missing-tracked which local [working copy] deleted |
795 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
753 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
796 file content1_content2_missing_missing-tracked was deleted in other [merge rev] but was modified in local [working copy]. |
754 other [merge rev] changed content1_content2_missing_missing-untracked which local [working copy] deleted |
797 What do you want to do? |
755 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
798 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
756 local [working copy] changed content1_missing_content1_content4-tracked which other [merge rev] deleted |
799 file content1_content2_missing_missing-untracked was deleted in other [merge rev] but was modified in local [working copy]. |
|
800 What do you want to do? |
|
801 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
802 file content1_missing_content1_content4-tracked was deleted in local [working copy] but was modified in other [merge rev]. |
|
803 What do you want to do? |
757 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
804 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
758 local [working copy] changed content1_missing_content3_content3-tracked which other [merge rev] deleted |
805 file content1_missing_content3_content3-tracked was deleted in local [working copy] but was modified in other [merge rev]. |
|
806 What do you want to do? |
759 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
807 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
760 local [working copy] changed content1_missing_content3_content4-tracked which other [merge rev] deleted |
808 file content1_missing_content3_content4-tracked was deleted in local [working copy] but was modified in other [merge rev]. |
|
809 What do you want to do? |
761 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
810 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
762 local [working copy] changed content1_missing_missing_content4-tracked which other [merge rev] deleted |
811 file content1_missing_missing_content4-tracked was deleted in local [working copy] but was modified in other [merge rev]. |
|
812 What do you want to do? |
763 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
813 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
764 merging missing_content2_content2_content4-tracked |
814 merging missing_content2_content2_content4-tracked |
765 merging missing_content2_content3_content3-tracked |
815 merging missing_content2_content3_content3-tracked |
766 merging missing_content2_content3_content4-tracked |
816 merging missing_content2_content3_content4-tracked |
767 merging missing_content2_missing_content4-tracked |
817 merging missing_content2_missing_content4-tracked |