Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-force
author Patrick Mezard <pmezard@gmail.com>
Wed, 23 Dec 2009 19:31:48 +0100
changeset 10128 ea7c392f2b08
parent 6256 69c75d063c7a
permissions -rwxr-xr-x
patch: drop eol normalization fast-path for 'lf' and 'crlf' With eolmode set to 'lf' or 'crlf' we avoided the hunk duplication and normalization by reading the input patch in text mode. Dropping this optimization simplifies code expectations for a small overhead. The change in test-mq-eol comes from a tolerance to CRLF instead of LF for last lines without newlines being broken by this revision. This tolerance was only partially supported and will be added again in a better way.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6255
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
#!/bin/sh
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 












ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     3


hg init repo













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     4


cd repo













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     5














ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     6


echo a > a













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     7


hg ci -qAm 'add a'













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     8














ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




     9


echo b > b













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    10


hg ci -qAm 'add b'













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    11














ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    12


hg up -qC 0













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    13


hg rm a













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    14


hg ci -m 'rm a'













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    15














ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    16


hg up -qC 1













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    17


rm a













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    18














ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    19


echo '% local deleted a file, remote removed'








6256






69c75d063c7a
merge: require --force when there are deleted files



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
6255

diff
changeset




    20


hg merge # should fail, since there are deleted files













69c75d063c7a
merge: require --force when there are deleted files



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
6255

diff
changeset




    21


hg -v merge --force








6255






ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    22


echo % should show a as removed













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    23


hg st













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    24














ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    25


hg ci -m merge













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    26


echo % manifest. should not have a:













ae83d927c629
add a test for a375ffc2aa1b



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    27


hg manifest















hg-stable