tests/test-rename-merge1.out
author Brodie Rao <me+hg@dackz.net>
Sat, 13 Feb 2010 23:34:15 -0500
changeset 10453 7edc649f9f7e
parent 10431 ba5e508b5e92
child 10490 f2618cacb485
permissions -rw-r--r--
progress: make determinate bar more like wget progress bar foo [ ] 0/58 foo [> ] 1/58 foo [=> ] 2/58 ... foo [=======================================================> ] 56/58 foo [========================================================> ] 57/58 foo [=========================================================>] 58/58 The bar now has a '>' character at the end. This indicates the direction, is consistent with the indeterminate '<=>' bar, and looks much nicer.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3153
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
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
     3
created new head
3153
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     4
merge
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
     5
  searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
     6
  unmatched files in local:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
     7
   c2
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
     8
  unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
     9
   b
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
    10
   b2
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
    11
  all copies found (* = to merge, ! = divergent):
5857
c704b03884ef merge: add a bit more sanity to divergent copy checks
Matt Mackall <mpm@selenic.com>
parents: 5764
diff changeset
    12
   c2 -> a2 !
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
    13
   b -> a *
5857
c704b03884ef merge: add a bit more sanity to divergent copy checks
Matt Mackall <mpm@selenic.com>
parents: 5764
diff changeset
    14
   b2 -> a2 !
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset
    15
  checking for directory renames
4674
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 3727
diff changeset
    16
 a2: divergent renames -> dr
8753
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
    17
resolving manifests
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
    18
 overwrite None partial False
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
    19
 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3652
diff changeset
    20
 a: remote moved to b -> m
3153
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    21
 b2: remote created -> g
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
    22
preserving a for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
    23
removing a
10431
ba5e508b5e92 update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents: 8753
diff changeset
    24
update: a 1/3 files (33.33%)
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
    25
picked tool 'internal:merge' for b (binary False symlink False)
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
    26
merging a and b to b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
    27
my b@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
    28
 premerge successful
10431
ba5e508b5e92 update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents: 8753
diff changeset
    29
update: a2 2/3 files (66.67%)
4674
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 3727
diff changeset
    30
warning: detected divergent renames of a2 to:
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 3727
diff changeset
    31
 c2
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 3727
diff changeset
    32
 b2
10431
ba5e508b5e92 update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents: 8753
diff changeset
    33
update: b2 3/3 files (100.00%)
3153
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    34
getting b2
3251
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
    35
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
3153
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    36
(branch merge, don't forget to commit)
3251
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
    37
M b
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
    38
  a
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
    39
M b2
c93ce7f10f85 merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents: 3153
diff changeset
    40
R a
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
    41
C c2
3153
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    42
blahblah
3292
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3252
diff changeset
    43
   rev    offset  length   base linkrev nodeid       p1           p2
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3252
diff changeset
    44
     0         0      67      0       1 dc51707dfc98 000000000000 000000000000
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3252
diff changeset
    45
     1        67      72      1       3 b2494a44f0a9 000000000000 dc51707dfc98
3652
f4dece0f7016 refactor debugrenamed
Matt Mackall <mpm@selenic.com>
parents: 3314
diff changeset
    46
b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66