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-merge4
author mpm@selenic.com
Sat, 25 Jun 2005 16:18:40 -0800
changeset 472 aa3d592df9b9
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rwxr-xr-x
extensions: use stdint.h -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 extensions: use stdint.h Not sure why I didn't do this the first time around. Hopefully still builds everywhere. manifest hash: 965582286a190728f8cc0dfb8e11ee56628a59a5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvfRgywK+sNU5EO8RAg9SAJ4/ZVpQZcDY5xovLDTZK2txEegEgwCdF2b+ lzSIP109qq8D+KIdUWsbEPc= =+0Yy -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
416
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
     1
 
#!/bin/sh -x
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
     2
 












5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




     3


hg init













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




     4


echo This is file a1 > a













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




     5


hg add a













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




     6


hg commit -t "commit #0" -d "0 0" -u user













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




     7


echo This is file b1 > b













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




     8


hg add b













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




     9


hg commit -t "commit #1" -d "0 0" -u user













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    10


hg update 0













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    11


echo This is file c1 > c













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    12


hg add c













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    13


hg commit -t "commit #2" -d "0 0" -u user













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    14


hg update -m 1













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    15


rm b













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    16


echo This is file c22 > c













5e9e8b8d2629
[PATCH] Removal of a file added by merging branches



mpm@selenic.com


parents: 

diff
changeset




    17


hg commit -t "commit #3" -d "0 0" -u user















mercurial-crew-with-dirclash