Mercurial > hg > gitweb
annotate tests/test-conflict.out @ 392:ee4c80d294e5
Tidy up conflict and pull tests
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Tidy up conflict and pull tests
Fix failure to kill hg serve process and pipeline ordering with set -e
manifest hash: eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg
pI3IH2BvqUlckdLwx3M5jcQ=
=s/QA
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Fri, 17 Jun 2005 08:50:55 -0800 |
| parents | e5d769afd3ef |
| children | eb46971fc57f |
| rev | line source |
|---|---|
| 346 | 1 + hg init |
| 2 + echo nothing | |
| 3 + hg add a | |
| 4 + hg commit -t ancestor -u test -d '0 0' | |
| 5 + echo something | |
| 6 + hg commit -t branch1 -u test -d '0 0' | |
| 7 + hg co 0 | |
| 8 + echo 'something else' | |
| 9 + hg commit -t branch2 -u test -d '0 0' | |
| 10 + export HGMERGE=merge | |
| 11 + HGMERGE=merge | |
| 12 + hg -d up -m 1 | |
| 13 merge: warning: conflicts during merge | |
| 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 | 16 a versions differ, resolve |
| 17 working dir created .out, keeping | |
| 18 merging a | |
| 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 | 21 merging a failed! |
| 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 | 24 + grep -Ev '>>>|<<<' a |
| 346 | 25 something else |
| 26 ======= | |
| 27 something | |
| 28 + hg status | |
| 29 C a | |
| 30 ? .out |