216 What do you want to do? u |
216 What do you want to do? u |
217 file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
217 file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
218 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
218 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
219 What do you want to do? u |
219 What do you want to do? u |
220 merging content1_content2_content1_content4-tracked |
220 merging content1_content2_content1_content4-tracked |
|
221 warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark') |
221 merging content1_content2_content2_content1-tracked |
222 merging content1_content2_content2_content1-tracked |
222 merging content1_content2_content2_content4-tracked |
223 merging content1_content2_content2_content4-tracked |
|
224 warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
223 merging content1_content2_content3_content1-tracked |
225 merging content1_content2_content3_content1-tracked |
224 merging content1_content2_content3_content3-tracked |
226 merging content1_content2_content3_content3-tracked |
|
227 warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
225 merging content1_content2_content3_content4-tracked |
228 merging content1_content2_content3_content4-tracked |
|
229 warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
226 merging content1_content2_missing_content1-tracked |
230 merging content1_content2_missing_content1-tracked |
227 merging content1_content2_missing_content4-tracked |
231 merging content1_content2_missing_content4-tracked |
|
232 warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
228 merging missing_content2_content2_content4-tracked |
233 merging missing_content2_content2_content4-tracked |
|
234 warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
229 merging missing_content2_content3_content3-tracked |
235 merging missing_content2_content3_content3-tracked |
|
236 warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
230 merging missing_content2_content3_content4-tracked |
237 merging missing_content2_content3_content4-tracked |
|
238 warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
231 merging missing_content2_missing_content4-tracked |
239 merging missing_content2_missing_content4-tracked |
|
240 warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
232 merging missing_content2_missing_content4-untracked |
241 merging missing_content2_missing_content4-untracked |
233 warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark') |
|
234 warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
|
235 warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
|
236 warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
|
237 warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
|
238 warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
|
239 warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
|
240 warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
|
241 warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
|
242 warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') |
242 warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') |
243 18 files updated, 3 files merged, 8 files removed, 35 files unresolved |
243 18 files updated, 3 files merged, 8 files removed, 35 files unresolved |
244 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
244 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
245 |
245 |
246 Check which files need to be resolved (should correspond to the output above). |
246 Check which files need to be resolved (should correspond to the output above). |
733 What do you want to do? u |
733 What do you want to do? u |
734 file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
734 file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
735 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
735 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
736 What do you want to do? u |
736 What do you want to do? u |
737 merging content1_content2_content1_content4-tracked |
737 merging content1_content2_content1_content4-tracked |
|
738 warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark') |
738 file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
739 file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
739 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
740 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
740 What do you want to do? u |
741 What do you want to do? u |
741 file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
742 file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
742 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
743 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
750 What do you want to do? u |
751 What do you want to do? u |
751 file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
752 file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
752 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
753 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
753 What do you want to do? u |
754 What do you want to do? u |
754 merging content1_content2_content2_content4-tracked |
755 merging content1_content2_content2_content4-tracked |
|
756 warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
755 file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
757 file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
756 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
758 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
757 What do you want to do? u |
759 What do you want to do? u |
758 file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
760 file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
759 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
761 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
767 What do you want to do? u |
769 What do you want to do? u |
768 file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
770 file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
769 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
771 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
770 What do you want to do? u |
772 What do you want to do? u |
771 merging content1_content2_content3_content3-tracked |
773 merging content1_content2_content3_content3-tracked |
|
774 warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
772 file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
775 file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
773 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
776 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
774 What do you want to do? u |
777 What do you want to do? u |
775 merging content1_content2_content3_content4-tracked |
778 merging content1_content2_content3_content4-tracked |
|
779 warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
776 file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
780 file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
777 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
781 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
778 What do you want to do? u |
782 What do you want to do? u |
779 file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
783 file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
780 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
784 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
788 What do you want to do? u |
792 What do you want to do? u |
789 file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
793 file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
790 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
794 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
791 What do you want to do? u |
795 What do you want to do? u |
792 merging content1_content2_missing_content4-tracked |
796 merging content1_content2_missing_content4-tracked |
|
797 warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
793 file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
798 file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
794 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
799 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
795 What do you want to do? u |
800 What do you want to do? u |
796 file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
801 file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
797 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
802 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
810 What do you want to do? u |
815 What do you want to do? u |
811 file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. |
816 file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. |
812 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
817 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
813 What do you want to do? u |
818 What do you want to do? u |
814 merging missing_content2_content2_content4-tracked |
819 merging missing_content2_content2_content4-tracked |
|
820 warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
815 merging missing_content2_content3_content3-tracked |
821 merging missing_content2_content3_content3-tracked |
|
822 warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
816 merging missing_content2_content3_content4-tracked |
823 merging missing_content2_content3_content4-tracked |
|
824 warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
817 merging missing_content2_missing_content4-tracked |
825 merging missing_content2_missing_content4-tracked |
|
826 warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
818 merging missing_content2_missing_content4-untracked |
827 merging missing_content2_missing_content4-untracked |
819 warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark') |
|
820 warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
|
821 warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
|
822 warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
|
823 warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
|
824 warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
|
825 warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
|
826 warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
|
827 warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
|
828 warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') |
828 warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') |
829 [1] |
829 [1] |
830 $ checkstatus > $TESTTMP/status2 2>&1 |
830 $ checkstatus > $TESTTMP/status2 2>&1 |
831 $ cmp $TESTTMP/status1 $TESTTMP/status2 || diff -U8 $TESTTMP/status1 $TESTTMP/status2 |
831 $ cmp $TESTTMP/status1 $TESTTMP/status2 || diff -U8 $TESTTMP/status1 $TESTTMP/status2 |
832 |
832 |