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-rename-merge1.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 16 Oct 2006 09:53:31 +0200
changeset 3409 1ae738bacf74
parent 3320 b16456909a0a
child 3659 f4dece0f7016
permissions -rw-r--r--
Fixed page overlap for file revision links in hgweb. This is another step to fix issue189, but currently the file revision numbers are read as changeset revision numbers, so the link will point to the wrong revision.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3155
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     1
 
checkout
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     2
 
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     3
 
merge
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     4
 
resolving manifests
3320
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3317
diff changeset 
     5
 
 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3317
diff changeset 
     6
 
 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
3314
ecc1bf27378c merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents: 3305
diff changeset 
     7
 
 a: remote moved -> m
3155
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     8
 
 b2: remote created -> g
3317
966632304dde merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents: 3314
diff changeset 
     9
 
merging a and b
3320
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3317
diff changeset 
    10
 
my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
3257
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset 
    11
 
copying a to b
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset 
    12
 
removing a
3155
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    13
 
getting b2
3257
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset 
    14
 
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
3155
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    15
 
(branch merge, don't forget to commit)
3257
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset 
    16
 
M b
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset 
    17
 
  a
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset 
    18
 
M b2
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset 
    19
 
R a
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset 
    20
 
C c2
3155
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    21
 
blahblah
3295
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3280
diff changeset 
    22
 
   rev    offset  length   base linkrev nodeid       p1           p2
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3280
diff changeset 
    23
 
     0         0      67      0       1 dc51707dfc98 000000000000 000000000000
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3280
diff changeset 
    24
 
     1        67      72      1       3 b2494a44f0a9 000000000000 dc51707dfc98
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3280
diff changeset 
    25
 
renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66
mercurial-crew-with-dirclash