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-tags.out
author mpm@selenic.com
Tue, 21 Jun 2005 18:41:57 -0800
changeset 407 0e0d0670b2bc
parent 377 e5d769afd3ef
child 485 c5705ab9cebd
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:
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     1
 
+ mkdir t
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     2
 
+ cd t
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     3
 
+ hg init
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     4
 
+ hg id
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     5
 
unknown
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     6
 
+ echo a
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     7
 
+ hg add a
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     8
 
+ hg commit -t test -u test -d '0 0'
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
     9
 
+ hg co
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    10
 
+ hg identify
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 345
diff changeset 
    11
 
acb14030fe0a tip
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    12
 
++ hg -q tip
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    13
 
++ cut -d : -f 2
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    14
 
+ T=acb14030fe0a21b60322c440ad2d20cf7685a376
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    15
 
+ echo 'acb14030fe0a21b60322c440ad2d20cf7685a376 first'
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    16
 
+ cat .hgtags
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    17
 
acb14030fe0a21b60322c440ad2d20cf7685a376 first
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    18
 
+ hg add .hgtags
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    19
 
+ hg commit -t 'add tags' -u test -d '0 0'
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    20
 
+ hg tags
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    21
 
tip                                1:b9154636be938d3d431e75a7c906504a079bfe07
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    22
 
first                              0:acb14030fe0a21b60322c440ad2d20cf7685a376
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    23
 
+ hg identify
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 345
diff changeset 
    24
 
b9154636be93 tip
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    25
 
+ echo bb
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    26
 
+ hg status
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    27
 
C a
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    28
 
+ hg identify
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 345
diff changeset 
    29
 
b9154636be93+ tip
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    30
 
+ hg co first
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    31
 
+ hg id
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 345
diff changeset 
    32
 
acb14030fe0a+ first
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    33
 
+ hg -v id
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    34
 
acb14030fe0a21b60322c440ad2d20cf7685a376+ first
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    35
 
+ hg status
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    36
 
C a
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    37
 
+ echo 1
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    38
 
+ hg add b
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    39
 
+ hg commit -t branch -u test -d '0 0'
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    40
 
+ hg id
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 345
diff changeset 
    41
 
c8edf04160c7 tip
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    42
 
+ hg co -m 1
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    43
 
+ hg id
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 345
diff changeset 
    44
 
c8edf04160c7+b9154636be93+ tip
345
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    45
 
+ hg status
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    46
 
C a
9d8d9207c0b3 Add a tags/identify test group
mpm@selenic.com
parents:
diff changeset 
    47
 
C .hgtags
mercurial-crew-with-dirclash