##// END OF EJS Templates
convert: test clean p2 file missing...
Mads Kiilerich -
r26844:e24eee55 default
parent child Browse files
Show More
@@ -740,4 +740,48 b' test converting merges into a repo that '
740 - converted/a
740 - converted/a
741 - toberemoved
741 - toberemoved
742
742
743 $ cd ..
743
744
745 Test case where cleanp2 contains a file that doesn't exist in p2 - for
746 example because filemap changed.
747
748 $ hg init cleanp2
749 $ cd cleanp2
750 $ touch f f1 f2 && hg ci -Aqm '0'
751 $ echo f1 > f1 && echo >> f && hg ci -m '1'
752 $ hg up -qr0 && echo f2 > f2 && echo >> f && hg ci -qm '2'
753 $ echo "include f" > filemap
754 $ hg convert --filemap filemap .
755 assuming destination .-hg
756 initializing destination .-hg repository
757 scanning source...
758 sorting...
759 converting...
760 2 0
761 1 1
762 0 2
763 $ hg merge && hg ci -qm '3'
764 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
765 (branch merge, don't forget to commit)
766 $ echo "include ." > filemap
767 $ hg convert --filemap filemap .
768 assuming destination .-hg
769 scanning source...
770 sorting...
771 converting...
772 0 3
773 $ hg -R .-hg log -G -T '{shortest(node)} {desc}\n{files % "- {file}\n"}\n'
774 o e9ed 3
775 |\
776 | o 33a0 2
777 | | - f
778 | |
779 o | f73e 1
780 |/ - f
781 |
782 o d681 0
783 - f
784
785 $ hg -R .-hg mani -r tip
786 f
787 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now