Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict.out @ 588:0c3bae18403b
[PATCH] hg revert
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] hg revert
From: Bryan O'Sullivan <bos@serpentine.com>
Add revert command.
manifest hash: 0094e6bf421f34bd0492a33f95400b1b095a6bdc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx2BaywK+sNU5EO8RAigMAKCrvgTtIDuirCsMVlbiTMqaJy3UNgCdEcTL
hMN1X8FZi6sH+NjUdr9sYBg=
=i58L
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Sat, 02 Jul 2005 19:49:46 -0800 |
| parents | ee4c80d294e5 |
| 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 |