Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-simple-update.out
author mpm@selenic.com
Tue, 21 Jun 2005 18:41:57 -0800
changeset 407 0e0d0670b2bc
parent 404 a1ecef497721
child 429 688d03d6997a
permissions -rw-r--r--
[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-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     1
 
+ mkdir test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     2
 
+ cd test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     3
 
+ echo foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     4
 
+ hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     5
 
+ hg addremove
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     6
 
+ hg commit -t 1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     7
 
+ hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     8
 
checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
     9
 
checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    10
 
crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    11
 
checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    12
 
1 files, 1 changesets, 1 total revisions
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    13
 
+ cd ..
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    14
 
+ mkdir branch
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    15
 
+ cd branch
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    16
 
+ hg init ../test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    17
 
+ hg co
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    18
 
+ echo bar
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    19
 
+ hg commit -t 2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    20
 
+ cd ../test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    21
 
+ hg pull ../branch
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset 
    22
 
pulling from ../branch
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    23
 
searching for changes
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    24
 
adding changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    25
 
adding manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    26
 
adding file revisions
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    27
 
modified 1 files, added 1 changesets and 1 new revisions
404
a1ecef497721 [PATCH] Unintuive use
mpm@selenic.com
parents: 350
diff changeset 
    28
 
(run 'hg update' to get a working copy)
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    29
 
+ hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    30
 
checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    31
 
checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    32
 
crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    33
 
checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    34
 
1 files, 2 changesets, 2 total revisions
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    35
 
+ hg co
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    36
 
+ cat foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    37
 
foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    38
 
bar
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    39
 
+ hg manifest
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset 
    40
 
6f4310b00b9a147241b071a60c28a650827fb03d 644 foo
mercurial-crew-with-dirclash