Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-conflict.out @ 589:4be4d4580467

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] bring MANIFEST.in up to date -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] bring MANIFEST.in up to date From: Andrew Thompson <andrewkt@aktzero.com> Some files were not coming over when I did python setup.py sdist I included MANIFEST.in for completeness, but I'm not sure if it should be in there. manifest hash: 9e055bea2829035685f8a4a9aaf07ee3f9785e1d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx2I7ywK+sNU5EO8RAl0EAJ9hwuKskuBwcSM46hqZY30JkMq8swCgnQVI 9FeppaKIUC3z2YMzhFHxRUQ= =3xJV -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 19:57:47 -0800
parents ee4c80d294e5
children eb46971fc57f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
1 + hg init
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
2 + echo nothing
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
3 + hg add a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
4 + hg commit -t ancestor -u test -d '0 0'
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
5 + echo something
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
6 + hg commit -t branch1 -u test -d '0 0'
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
7 + hg co 0
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
8 + echo 'something else'
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
9 + hg commit -t branch2 -u test -d '0 0'
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
10 + export HGMERGE=merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
11 + HGMERGE=merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
12 + hg -d up -m 1
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
13 merge: warning: conflicts during merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
14 resolving manifests
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 346
diff changeset
15 ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
16 a versions differ, resolve
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
17 working dir created .out, keeping
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
18 merging a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
19 resolving a
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 346
diff changeset
20 file a: other d7250518cb1b ancestor 68ba9db7a9e4
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
21 merging a failed!
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
22 + hg id
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 346
diff changeset
23 32e80765d7fe+75234512624c+ tip
392
ee4c80d294e5 Tidy up conflict and pull tests
mpm@selenic.com
parents: 377
diff changeset
24 + grep -Ev '>>>|<<<' a
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
25 something else
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
26 =======
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
27 something
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
28 + hg status
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
29 C a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
30 ? .out