Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-conflict.out @ 654:fafc16f705b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make cloning by hardlink quiet again -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make cloning by hardlink quiet again manifest hash: bd12b4deedb99e06415619f858b95b566a6d329e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzvGGywK+sNU5EO8RAiCzAJ9iCRbyijLT7PqkgCI9eFn+9pl+KQCfdcB1 yHxfvLCL39wAAcBo6Hebpvo= =qne+ -----END PGP SIGNATURE-----
author Matt Mackall <mpm@selenic.com>
date Fri, 08 Jul 2005 13:35:02 -0800
parents eb46971fc57f
children c5df1a9c5276
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
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 392
diff changeset
12 + hg up -m 1
346
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 merging a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
15 merging a failed!
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
16 + hg id
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 346
diff changeset
17 32e80765d7fe+75234512624c+ tip
392
ee4c80d294e5 Tidy up conflict and pull tests
mpm@selenic.com
parents: 377
diff changeset
18 + grep -Ev '>>>|<<<' a
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
19 something else
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
20 =======
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
21 something
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
22 + hg status
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
23 C a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset
24 ? .out