Mercurial > hg
comparison tests/test-win32text @ 8742:a964ab624385
merge: allow merging going backwards
New behavior is generally superior and more correct, except possibly
with regards to missing files. hg up . is now effectively a no-op,
which is probably the desired behavior for people expecting to move to
tip, but may surprise people who were expecting deleted files to
reappear.
case 1: update to .
a-w -> a-w
classic: ancestor a
missing recreated right?
rmed recreated WRONG
added forgotten WRONG
changed preserved RIGHT
conflicted can't happen
backward merge: ancestor a (NO EFFECT)
missing missing wrong?
rm'ed rm'ed RIGHT
added preserved RIGHT
changed preserved RIGHT
conflicted can't happen
case 2: update to ancestor of .
a-b-w -> b-w
\
a
classic: ancestor a
missing recreated right?
rmed recreated wrong?
added forgotten wrong?
changed preserved RIGHT
conflicted preserved wrong?
backwards merge: ancestor b
missing missing or conflict right?
rm'ed missing or conflict right?
changed preserved RIGHT
conflicted merge RIGHT
added preserved right?
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 08 Jun 2009 18:14:44 -0500 |
| parents | 6c82beaaa11a |
| children | f584d63c49c3 |
comparison
equal
deleted
inserted
replaced
| 8741:e592180ba435 | 8742:a964ab624385 |
|---|---|
| 115 echo '** = cleverencode:' >> .hg/hgrc | 115 echo '** = cleverencode:' >> .hg/hgrc |
| 116 cat .hg/hgrc | 116 cat .hg/hgrc |
| 117 echo | 117 echo |
| 118 | 118 |
| 119 rm f3 f4.bat bin | 119 rm f3 f4.bat bin |
| 120 hg co 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))' | 120 hg co -C 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))' |
| 121 python print.py < bin | 121 python print.py < bin |
| 122 python print.py < f3 | 122 python print.py < f3 |
| 123 python print.py < f4.bat | 123 python print.py < f4.bat |
| 124 echo | 124 echo |
| 125 | 125 |
| 150 echo '** = !' >> .hg/hgrc | 150 echo '** = !' >> .hg/hgrc |
| 151 cat .hg/hgrc | 151 cat .hg/hgrc |
| 152 echo | 152 echo |
| 153 | 153 |
| 154 rm f3 f4.bat bin | 154 rm f3 f4.bat bin |
| 155 hg co 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))' | 155 hg co -C 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))' |
| 156 python print.py < bin | 156 python print.py < bin |
| 157 python print.py < f3 | 157 python print.py < f3 |
| 158 python print.py < f4.bat | 158 python print.py < f4.bat |
| 159 echo | 159 echo |
| 160 | 160 |