equal
deleted
inserted
replaced
55 |
55 |
56 $ hg commit -m B |
56 $ hg commit -m B |
57 |
57 |
58 should be sorted by path for stable result |
58 should be sorted by path for stable result |
59 |
59 |
60 $ for i in `python $TESTDIR/seq.py 0 9`; do |
60 $ for i in `$PYTHON $TESTDIR/seq.py 0 9`; do |
61 > cp small-file $i |
61 > cp small-file $i |
62 > done |
62 > done |
63 $ rm small-file |
63 $ rm small-file |
64 $ hg addremove |
64 $ hg addremove |
65 adding 0 |
65 adding 0 |
86 $ hg commit -m '10 same files' |
86 $ hg commit -m '10 same files' |
87 |
87 |
88 pick one from many identical files |
88 pick one from many identical files |
89 |
89 |
90 $ cp 0 a |
90 $ cp 0 a |
91 $ rm `python $TESTDIR/seq.py 0 9` |
91 $ rm `$PYTHON $TESTDIR/seq.py 0 9` |
92 $ hg addremove |
92 $ hg addremove |
93 removing 0 |
93 removing 0 |
94 removing 1 |
94 removing 1 |
95 removing 2 |
95 removing 2 |
96 removing 3 |
96 removing 3 |
105 $ hg revert -aq |
105 $ hg revert -aq |
106 |
106 |
107 pick one from many similar files |
107 pick one from many similar files |
108 |
108 |
109 $ cp 0 a |
109 $ cp 0 a |
110 $ for i in `python $TESTDIR/seq.py 0 9`; do |
110 $ for i in `$PYTHON $TESTDIR/seq.py 0 9`; do |
111 > echo $i >> $i |
111 > echo $i >> $i |
112 > done |
112 > done |
113 $ hg commit -m 'make them slightly different' |
113 $ hg commit -m 'make them slightly different' |
114 $ rm `python $TESTDIR/seq.py 0 9` |
114 $ rm `$PYTHON $TESTDIR/seq.py 0 9` |
115 $ hg addremove -s50 |
115 $ hg addremove -s50 |
116 removing 0 |
116 removing 0 |
117 removing 1 |
117 removing 1 |
118 removing 2 |
118 removing 2 |
119 removing 3 |
119 removing 3 |