Mercurial > hg > gitserve

annotate tests/test-merge4.out @ 519:50768efaf6f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a CONTRIBUTORS file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add a CONTRIBUTORS file Compiled by Rafael Villar Burke <pachi@mmn-arquitectos.com> manifest hash: 20acfff6abdd47408d8262d15b19099c33b85151 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwvDlywK+sNU5EO8RAuujAJ4wYp+deMoUO54W8qBAFXKY3IHGPACeJNpO x1rRm1amHz3V2RAfk/Rh9ZM= =8t0h -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 29 Jun 2005 11:05:09 -0800
parents 5e9e8b8d2629
children 7e4843b7efd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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