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.out
author mpm@selenic.com
Wed, 22 Jun 2005 11:23:01 -0800
changeset 432 3b9e3d3d2810
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rw-r--r--
Start using bdiff for generating deltas -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Start using bdiff for generating deltas manifest hash: bf6ed7d17d96810b7f40b50811b104b568c64b4b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCubqVywK+sNU5EO8RAor6AKCm8Zqg0DIhLzaMPp5/GKPKk/GjKwCfbCe+ /CBmpvcTxSJofY9RE08cCVY= =2yu2 -----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
 
+ hg init
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
     2
 
+ echo This is file a1
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
     3
 
+ hg add a
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
     4
 
+ 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 
     5
 
+ echo This is file b1
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
     6
 
+ hg add b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
     7
 
+ 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 
     8
 
+ hg update 0
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
     9
 
+ echo This is file c1
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
    10
 
+ hg add c
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
    11
 
+ 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 
    12
 
+ hg update -m 1
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
    13
 
+ rm b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
    14
 
+ echo This is file c22
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset 
    15
 
+ hg commit -t 'commit #3' -d '0 0' -u user
mercurial-crew-with-dirclash