Mercurial > hg

annotate tests/test-issue672.out @ 12395:cc6d40dffa45 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-archive: fix touch datestamps Backport 3acd5f7ab9d0 and 9581d5efb6a5 to stable.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 24 Sep 2010 02:49:09 +0200
parents db426935fa94
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
1 adding 1
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
2 adding 2
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
4 created new head
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
5 searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
6 unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
7 1a
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
8 all copies found (* = to merge, ! = divergent):
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
9 1a -> 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
10 checking for directory renames
8753
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset
11 resolving manifests
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset
12 overwrite None partial False
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10431
diff changeset
13 ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
14 1: other deleted -> r
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
15 1a: remote created -> g
11716
db426935fa94 progress: use gerund (updating) for merge progress
timeless <timeless@gmail.com>
parents: 10490
diff changeset
16 updating: 1 1/2 files (50.00%)
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
17 removing 1
11716
db426935fa94 progress: use gerund (updating) for merge progress
timeless <timeless@gmail.com>
parents: 10490
diff changeset
18 updating: 1a 2/2 files (100.00%)
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
19 getting 1a
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
21 (branch merge, don't forget to commit)
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
22 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
23 created new head
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
24 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
25 searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
26 unmatched files in local:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
27 1a
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
28 all copies found (* = to merge, ! = divergent):
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
29 1a -> 1 *
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
30 checking for directory renames
8753
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset
31 resolving manifests
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset
32 overwrite None partial False
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10431
diff changeset
33 ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96
8748
f325574dad1a merge: combine a copy and move case
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
34 1a: local copied/moved to 1 -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
35 preserving 1a for resolve of 1a
11716
db426935fa94 progress: use gerund (updating) for merge progress
timeless <timeless@gmail.com>
parents: 10490
diff changeset
36 updating: 1a 1/1 files (100.00%)
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5810
diff changeset
37 picked tool 'internal:merge' for 1a (binary False symlink False)
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
38 merging 1a and 1 to 1a
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10431
diff changeset
39 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5810
diff changeset
40 premerge successful
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
41 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
42 (branch merge, don't forget to commit)
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
43 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
44 searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
45 unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
46 1a
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
47 all copies found (* = to merge, ! = divergent):
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
48 1a -> 1 *
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5096
diff changeset
49 checking for directory renames
8753
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset
50 resolving manifests
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents: 8748
diff changeset
51 overwrite None partial False
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10431
diff changeset
52 ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
53 1: remote moved to 1a -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
54 preserving 1 for resolve of 1a
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
55 removing 1
11716
db426935fa94 progress: use gerund (updating) for merge progress
timeless <timeless@gmail.com>
parents: 10490
diff changeset
56 updating: 1 1/1 files (100.00%)
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
57 picked tool 'internal:merge' for 1a (binary False symlink False)
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
58 merging 1 and 1a to 1a
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10431
diff changeset
59 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5810
diff changeset
60 premerge successful
5096
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
61 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
ad6b97132b81 merge: fix a copy detection bug (issue672)
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
62 (branch merge, don't forget to commit)