657   $ hg merge          'desc("merge-deleting-the-file-from-updated")'

   657   $ hg merge          'desc("merge-deleting-the-file-from-updated")'

   658   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   658   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   659   (branch merge, don't forget to commit)

   659   (branch merge, don't forget to commit)

   660   $ ls -1

   660   $ ls -1

   661   other-file

   661   other-file

   662 

   664 

   663 (merging a deletion with keeping → conflict)

   665 (merging a deletion with keeping → conflict)

   664 BROKEN: this should result in conflict

   666 BROKEN: this should result in conflict

   665 

   667 

   666   $ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'

   668   $ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'

   670   0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)

   672   0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)

   671   (branch merge, don't forget to commit)

   673   (branch merge, don't forget to commit)

   672   $ ls -1

   674   $ ls -1

   673   other-file

   675   other-file

   674   the-file (newfilenode !)

   676   the-file (newfilenode !)

   675 

   687 

   676 (merging a deletion with keeping → conflict)

   688 (merging a deletion with keeping → conflict)

   677 BROKEN: this should result in conflict

   689 BROKEN: this should result in conflict

   678 

   690 

   679   $ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'

   691   $ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'

   682   $ hg merge          'desc("merge-keeping-the-file-from-updated")'

   694   $ hg merge          'desc("merge-keeping-the-file-from-updated")'

   683   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   695   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   684   (branch merge, don't forget to commit)

   696   (branch merge, don't forget to commit)

   685   $ ls -1

   697   $ ls -1

   686   other-file

   698   other-file

   687 

   701 

   688 (merging two deletion together → no conflict)

   702 (merging two deletion together → no conflict)

   689 

   703 

   690   $ hg update --clean 'desc("merge-deleting-the-file-from-updated")'

   704   $ hg update --clean 'desc("merge-deleting-the-file-from-updated")'

   691   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   705   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   692   $ hg merge          'desc("merge-deleting-the-file-from-deleted")'

   706   $ hg merge          'desc("merge-deleting-the-file-from-deleted")'

   693   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   707   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   694   (branch merge, don't forget to commit)

   708   (branch merge, don't forget to commit)

   695   $ ls -1

   709   $ ls -1

   696   other-file

   710   other-file

   697 

   713 

   698 (merging a deletion with keeping → conflict)

   714 (merging a deletion with keeping → conflict)

   699 BROKEN: this should result in conflict

   715 BROKEN: this should result in conflict

   700 

   716 

   701   $ hg update --clean 'desc("merge-deleting-the-file-from-updated")'

   717   $ hg update --clean 'desc("merge-deleting-the-file-from-updated")'

   705   0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)

   721   0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)

   706   (branch merge, don't forget to commit)

   722   (branch merge, don't forget to commit)

   707   $ ls -1

   723   $ ls -1

   708   other-file

   724   other-file

   709   the-file (newfilenode !)

   725   the-file (newfilenode !)

   710 

   735 

   711 (merging a deletion with keeping → conflict)

   736 (merging a deletion with keeping → conflict)

   712 BROKEN: this should result in conflict

   737 BROKEN: this should result in conflict

   713 

   738 

   714   $ hg update --clean 'desc("merge-deleting-the-file-from-updated")'

   739   $ hg update --clean 'desc("merge-deleting-the-file-from-updated")'

   717   $ hg merge          'desc("merge-keeping-the-file-from-updated")'

   742   $ hg merge          'desc("merge-keeping-the-file-from-updated")'

   718   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   743   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   719   (branch merge, don't forget to commit)

   744   (branch merge, don't forget to commit)

   720   $ ls -1

   745   $ ls -1

   721   other-file

   746   other-file

   722 

   749 

   723 (merging two "keeping" together → no conflict)

   750 (merging two "keeping" together → no conflict)

   724 

   751 

   725   $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'

   752   $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'

   726   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   753   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

   729   0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)

   756   0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)

   730   (branch merge, don't forget to commit)

   757   (branch merge, don't forget to commit)

   731   $ ls -1

   758   $ ls -1

   732   other-file

   759   other-file

   733   the-file

   760   the-file

   734 

   770 

   735 (merging a deletion with keeping → conflict)

   771 (merging a deletion with keeping → conflict)

   736 BROKEN: this should result in conflict

   772 BROKEN: this should result in conflict

   737 

   773 

   738   $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'

   774   $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'

   742   abort: empty revision set

   778   abort: empty revision set

   743   [255]

   779   [255]

   744   $ ls -1

   780   $ ls -1

   745   other-file

   781   other-file

   746   the-file

   782   the-file

   747 

   785 

   748 (merging a deletion with keeping → conflict)

   786 (merging a deletion with keeping → conflict)

   749 BROKEN: this should result in conflict

   787 BROKEN: this should result in conflict

   750 

   788 

   751   $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'

   789   $ hg update --clean 'desc("merge-keeping-the-file-from-updated")'

   754   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   792   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   755   (branch merge, don't forget to commit)

   793   (branch merge, don't forget to commit)

   756   $ ls -1

   794   $ ls -1

   757   other-file

   795   other-file

   758   the-file

   796   the-file

   759 

   799 

   760 (merging two "keeping" together → no conflict)

   800 (merging two "keeping" together → no conflict)

   761 

   801 

   762   $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'

   802   $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'

   763   1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)

   803   1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)

   766   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   806   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   767   (branch merge, don't forget to commit)

   807   (branch merge, don't forget to commit)

   768   $ ls -1

   808   $ ls -1

   769   other-file

   809   other-file

   770   the-file

   810   the-file

   771 

   813 

   772 (merging a deletion with keeping → conflict)

   814 (merging a deletion with keeping → conflict)

   773 BROKEN: this should result in conflict

   815 BROKEN: this should result in conflict

   774 

   816 

   775   $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'

   817   $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'

   778   abort: empty revision set

   820   abort: empty revision set

   779   [255]

   821   [255]

   780   $ ls -1

   822   $ ls -1

   781   other-file

   823   other-file

   782   the-file

   824   the-file

   783 

   827 

   784 (merging a deletion with keeping → conflict)

   828 (merging a deletion with keeping → conflict)

   785 BROKEN: this should result in conflict

   829 BROKEN: this should result in conflict

   786 

   830 

   787   $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'

   831   $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'

   790   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   834   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   791   (branch merge, don't forget to commit)

   835   (branch merge, don't forget to commit)

   792   $ ls -1

   836   $ ls -1

   793   other-file

   837   other-file

   794   the-file

   838   the-file