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
Fri, 01 Jul 2005 14:18:02 -0800
changeset 565 9a80418646dd
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rwxr-xr-x
[PATCH] Make ui.warn write to stderr -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Make ui.warn write to stderr From: Bryan O'Sullivan <bos@serpentine.com> > Someone is probably using ui.write instead of ui.warn. Actually, ui.warn uses ui.write. So hg never prints to stderr right now. Here's a patch to fix that. [mpm: add sys.stdout.flush()] manifest hash: c09c645a5985b640a7ad884afb0eeb11fcffbb19 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxcEaywK+sNU5EO8RAhWUAJ9vVteAodKC9zIhIWUuPqVl2d915QCePp5S asuv62w4Zv+o0gB3SoucYdQ= =NYrs -----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