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 changed content1_missing_content1_content4-tracked which remote deleted |
145 local changed content1_missing_content1_content4-tracked which other deleted |
146 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
146 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
147 local changed content1_missing_content3_content3-tracked which remote deleted |
147 local changed content1_missing_content3_content3-tracked which other deleted |
148 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
148 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
149 local changed content1_missing_content3_content4-tracked which remote deleted |
149 local changed content1_missing_content3_content4-tracked which other deleted |
150 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
150 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
151 local changed content1_missing_missing_content4-tracked which remote deleted |
151 local changed content1_missing_missing_content4-tracked which other deleted |
152 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
152 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
153 remote changed content1_content2_content1_content1-untracked which local deleted |
153 other changed content1_content2_content1_content1-untracked which local deleted |
154 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
154 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
155 remote changed content1_content2_content1_content2-untracked which local deleted |
155 other changed content1_content2_content1_content2-untracked which local deleted |
156 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 |
157 remote changed content1_content2_content1_content4-untracked which local deleted |
157 other changed content1_content2_content1_content4-untracked which local deleted |
158 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
158 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
159 remote changed content1_content2_content1_missing-tracked which local deleted |
159 other changed content1_content2_content1_missing-tracked which local deleted |
160 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
160 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
161 remote changed content1_content2_content1_missing-untracked which local deleted |
161 other changed content1_content2_content1_missing-untracked which local deleted |
162 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 |
163 remote changed content1_content2_content2_content1-untracked which local deleted |
163 other changed content1_content2_content2_content1-untracked which local deleted |
164 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
164 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
165 remote changed content1_content2_content2_content2-untracked which local deleted |
165 other changed content1_content2_content2_content2-untracked which local deleted |
166 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
166 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
167 remote changed content1_content2_content2_content4-untracked which local deleted |
167 other changed content1_content2_content2_content4-untracked which local deleted |
168 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 |
169 remote changed content1_content2_content2_missing-tracked which local deleted |
169 other changed content1_content2_content2_missing-tracked which local deleted |
170 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
170 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
171 remote changed content1_content2_content2_missing-untracked which local deleted |
171 other changed content1_content2_content2_missing-untracked which local deleted |
172 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
172 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
173 remote changed content1_content2_content3_content1-untracked which local deleted |
173 other changed content1_content2_content3_content1-untracked which local deleted |
174 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 |
175 remote changed content1_content2_content3_content2-untracked which local deleted |
175 other changed content1_content2_content3_content2-untracked which local deleted |
176 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
176 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
177 remote changed content1_content2_content3_content3-untracked which local deleted |
177 other changed content1_content2_content3_content3-untracked which local deleted |
178 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
178 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
179 remote changed content1_content2_content3_content4-untracked which local deleted |
179 other changed content1_content2_content3_content4-untracked which local deleted |
180 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 |
181 remote changed content1_content2_content3_missing-tracked which local deleted |
181 other changed content1_content2_content3_missing-tracked which local deleted |
182 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
182 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
183 remote changed content1_content2_content3_missing-untracked which local deleted |
183 other changed content1_content2_content3_missing-untracked which local deleted |
184 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
184 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
185 remote changed content1_content2_missing_content1-untracked which local deleted |
185 other changed content1_content2_missing_content1-untracked which local deleted |
186 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 |
187 remote changed content1_content2_missing_content2-untracked which local deleted |
187 other changed content1_content2_missing_content2-untracked which local deleted |
188 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
188 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
189 remote changed content1_content2_missing_content4-untracked which local deleted |
189 other changed content1_content2_missing_content4-untracked which local deleted |
190 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
190 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
191 remote changed content1_content2_missing_missing-tracked which local deleted |
191 other changed content1_content2_missing_missing-tracked which local deleted |
192 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 |
193 remote changed content1_content2_missing_missing-untracked which local deleted |
193 other changed content1_content2_missing_missing-untracked which local deleted |
194 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
194 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
195 merging content1_content2_content1_content4-tracked |
195 merging content1_content2_content1_content4-tracked |
196 merging content1_content2_content2_content1-tracked |
196 merging content1_content2_content2_content1-tracked |
197 merging content1_content2_content2_content4-tracked |
197 merging content1_content2_content2_content4-tracked |
198 merging content1_content2_content3_content1-tracked |
198 merging content1_content2_content3_content1-tracked |
701 $ hg resolve --unmark --all |
701 $ hg resolve --unmark --all |
702 $ hg resolve --all --tool :local |
702 $ hg resolve --all --tool :local |
703 (no more unresolved files) |
703 (no more unresolved files) |
704 $ hg resolve --unmark --all |
704 $ hg resolve --unmark --all |
705 $ hg resolve --all --tool internal:merge3 |
705 $ hg resolve --all --tool internal:merge3 |
706 remote changed content1_content2_content1_content1-untracked which local deleted |
706 other changed content1_content2_content1_content1-untracked which local deleted |
707 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
707 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
708 remote changed content1_content2_content1_content2-untracked which local deleted |
708 other changed content1_content2_content1_content2-untracked which local deleted |
709 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
709 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
710 merging content1_content2_content1_content4-tracked |
710 merging content1_content2_content1_content4-tracked |
711 remote changed content1_content2_content1_content4-untracked which local deleted |
711 other changed content1_content2_content1_content4-untracked which local deleted |
712 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
712 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
713 remote changed content1_content2_content1_missing-tracked which local deleted |
713 other changed content1_content2_content1_missing-tracked which local deleted |
714 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 |
715 remote changed content1_content2_content1_missing-untracked which local deleted |
715 other changed content1_content2_content1_missing-untracked which local deleted |
716 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
716 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
717 merging content1_content2_content2_content1-tracked |
717 merging content1_content2_content2_content1-tracked |
718 remote changed content1_content2_content2_content1-untracked which local deleted |
718 other changed content1_content2_content2_content1-untracked which local deleted |
719 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
719 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
720 remote changed content1_content2_content2_content2-untracked which local deleted |
720 other changed content1_content2_content2_content2-untracked which local deleted |
721 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
721 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
722 merging content1_content2_content2_content4-tracked |
722 merging content1_content2_content2_content4-tracked |
723 remote changed content1_content2_content2_content4-untracked which local deleted |
723 other changed content1_content2_content2_content4-untracked which local deleted |
724 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
724 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
725 remote changed content1_content2_content2_missing-tracked which local deleted |
725 other changed content1_content2_content2_missing-tracked which local deleted |
726 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 |
727 remote changed content1_content2_content2_missing-untracked which local deleted |
727 other changed content1_content2_content2_missing-untracked which local deleted |
728 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
728 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
729 merging content1_content2_content3_content1-tracked |
729 merging content1_content2_content3_content1-tracked |
730 remote changed content1_content2_content3_content1-untracked which local deleted |
730 other changed content1_content2_content3_content1-untracked which local deleted |
731 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
731 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
732 remote changed content1_content2_content3_content2-untracked which local deleted |
732 other changed content1_content2_content3_content2-untracked which local deleted |
733 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
733 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
734 merging content1_content2_content3_content3-tracked |
734 merging content1_content2_content3_content3-tracked |
735 remote changed content1_content2_content3_content3-untracked which local deleted |
735 other changed content1_content2_content3_content3-untracked which local deleted |
736 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 |
737 merging content1_content2_content3_content4-tracked |
737 merging content1_content2_content3_content4-tracked |
738 remote changed content1_content2_content3_content4-untracked which local deleted |
738 other changed content1_content2_content3_content4-untracked which local deleted |
739 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
739 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
740 remote changed content1_content2_content3_missing-tracked which local deleted |
740 other changed content1_content2_content3_missing-tracked which local deleted |
741 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 |
742 remote changed content1_content2_content3_missing-untracked which local deleted |
742 other changed content1_content2_content3_missing-untracked which local deleted |
743 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
743 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
744 merging content1_content2_missing_content1-tracked |
744 merging content1_content2_missing_content1-tracked |
745 remote changed content1_content2_missing_content1-untracked which local deleted |
745 other changed content1_content2_missing_content1-untracked which local deleted |
746 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 |
747 remote changed content1_content2_missing_content2-untracked which local deleted |
747 other changed content1_content2_missing_content2-untracked which local deleted |
748 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
748 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
749 merging content1_content2_missing_content4-tracked |
749 merging content1_content2_missing_content4-tracked |
750 remote changed content1_content2_missing_content4-untracked which local deleted |
750 other changed content1_content2_missing_content4-untracked which local deleted |
751 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
751 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
752 remote changed content1_content2_missing_missing-tracked which local deleted |
752 other changed content1_content2_missing_missing-tracked which local deleted |
753 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 |
754 remote changed content1_content2_missing_missing-untracked which local deleted |
754 other changed content1_content2_missing_missing-untracked which local deleted |
755 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
755 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
756 local changed content1_missing_content1_content4-tracked which remote deleted |
756 local changed content1_missing_content1_content4-tracked which other deleted |
757 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
757 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
758 local changed content1_missing_content3_content3-tracked which remote deleted |
758 local changed content1_missing_content3_content3-tracked which other deleted |
759 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
759 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
760 local changed content1_missing_content3_content4-tracked which remote deleted |
760 local changed content1_missing_content3_content4-tracked which other deleted |
761 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
761 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
762 local changed content1_missing_missing_content4-tracked which remote deleted |
762 local changed content1_missing_missing_content4-tracked which other deleted |
763 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
763 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
764 merging missing_content2_content2_content4-tracked |
764 merging missing_content2_content2_content4-tracked |
765 merging missing_content2_content3_content3-tracked |
765 merging missing_content2_content3_content3-tracked |
766 merging missing_content2_content3_content4-tracked |
766 merging missing_content2_content3_content4-tracked |
767 merging missing_content2_missing_content4-tracked |
767 merging missing_content2_missing_content4-tracked |