Mercurial > hg
annotate tests/test-undo.out @ 407:0e0d0670b2bc
[PATCH] Merging identical changes from another branch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Merging identical changes from another branch
From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk>
The issue comes up when a local uncommitted *new* file (i.e. not in the
current manifest) is being merged with an identical file from a branch.
Since the file is not in the current manifest (it's either in the
current "to-be-added" list, or in the "unknown" state), there's no
(local) node from which to create a mergepoint.
manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01
92uuMswZXcoCchQAaxew7C0=
=qRsk
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 18:41:57 -0800 |
parents | 398737777644 |
children | 509e62469cb1 |
rev | line source |
---|---|
336 | 1 + mkdir t |
2 + cd t | |
3 + hg init | |
4 + echo a | |
5 + hg add a | |
6 + hg commit -t test -u test -d '0 0' | |
7 + hg verify | |
8 checking changesets | |
9 checking manifests | |
10 crosschecking files in changesets and manifests | |
11 checking files | |
12 1 files, 1 changesets, 1 total revisions | |
13 + hg parents | |
14 changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376 | |
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
15 tag: tip |
336 | 16 user: test |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
350
diff
changeset
|
17 date: Thu Jan 1 00:00:00 1970 |
336 | 18 summary: test |
19 | |
20 + hg status | |
21 + hg undo | |
22 attempting to rollback last transaction | |
23 + hg verify | |
24 checking changesets | |
25 checking manifests | |
26 crosschecking files in changesets and manifests | |
27 checking files | |
28 0 files, 0 changesets, 0 total revisions | |
29 + hg parents | |
30 + hg status | |
31 A a |