Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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-pull-update
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 06 Oct 2007 15:30:15 -0300
changeset 5403 477136fa6571
parent 5097 73fdc8bd3ed8
permissions -rwxr-xr-x
Always copy the necessary files before applying a git patch This patch removes the "copymod" attribute from the gitpatch class. AFAICS, that attribute was only used to delay the copying of renamed/copied files if there are no other changes to the target, but in this case, if there are changes to the source, we'll end up copying the wrong version. This should fix issue762.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5097
73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     1
 
#!/bin/sh
73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     2
 
#
73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset 
     3
 












73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     4


hg init t













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     5


cd t













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     6


echo 1 > foo













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     7


hg ci -Am m













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     8














73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




     9


cd ..













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    10


hg clone t tt













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    11


cd tt













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    12


echo 1.1 > foo













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    13


hg ci -Am m













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    14














73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    15


cd ../t













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    16


echo 1.2 > foo













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    17


hg ci -Am m













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    18


echo % should fail













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    19


hg pull -u ../tt













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    20














73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    21


cd ../tt













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    22


echo % should fail













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    23


hg pull -u ../t













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    24


HGMERGE=true hg merge













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    25


hg ci -mm













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    26














73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    27


cd ../t













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    28


echo % should work













73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).



Thomas Arendsen Hein <thomas@intevation.de>


parents: 

diff
changeset




    29


hg pull -u ../tt















mercurial-crew-with-dirclash