Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-copy2.out @ 3295:764688cf51e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 19:57:45 -0500
parents 19b048da4da9
children f4dece0f7016
line wrap: on
line source

# should show copy
copy: foo -> bar
# shouldn't show copy
# should match
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
# should not be renamed
not renamed
# should show copy
copy: foo -> bar
# should show no parents for tip
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0      69      0       1 6ca237634e1f 000000000000 000000000000
     1        69       6      1       2 7a1ff8e75f5b 6ca237634e1f 000000000000
     2        75      82      1       3 243dfe60f3d9 000000000000 000000000000
# should match
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
     1         5       7      1       2 dd12c926cf16 2ed2a3912a0b 000000000000
renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
# should show no copies