author | Thomas Arendsen Hein <thomas@intevation.de> |
Sun, 05 Sep 2010 22:32:11 +0200 | |
branch | stable |
changeset 12170 | 581066a319e5 |
parent 11716 | db426935fa94 |
permissions | -rw-r--r-- |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
1 |
created new head |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
2 |
changeset: 1:d9da848d0adf |
8387
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6512
diff
changeset
|
3 |
user: test |
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6512
diff
changeset
|
4 |
date: Mon Jan 12 13:46:40 1970 +0000 |
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6512
diff
changeset
|
5 |
summary: cp foo bar; change both |
50b6af595e0c
merge: add -S/--show option to review revisions without merging
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6512
diff
changeset
|
6 |
|
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5042
diff
changeset
|
7 |
searching for copies back to rev 1 |
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 |
bar |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5042
diff
changeset
|
10 |
all copies found (* = to merge, ! = divergent): |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5042
diff
changeset
|
11 |
bar -> foo * |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5042
diff
changeset
|
12 |
checking for directory renames |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8387
diff
changeset
|
13 |
resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8387
diff
changeset
|
14 |
overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
15 |
ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 |
foo: versions differ -> m |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
17 |
foo: remote copied to bar -> m |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
18 |
preserving foo for resolve of bar |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
19 |
preserving foo for resolve of foo |
11716
db426935fa94
progress: use gerund (updating) for merge progress
timeless <timeless@gmail.com>
parents:
10490
diff
changeset
|
20 |
updating: foo 1/2 files (50.00%) |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
21 |
picked tool 'internal:merge' for bar (binary False symlink False) |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
22 |
merging foo and bar to bar |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
23 |
my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
24 |
premerge successful |
11716
db426935fa94
progress: use gerund (updating) for merge progress
timeless <timeless@gmail.com>
parents:
10490
diff
changeset
|
25 |
updating: foo 2/2 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
26 |
picked tool 'internal:merge' for foo (binary False symlink False) |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
27 |
merging foo |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
28 |
my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
29 |
premerge successful |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
30 |
0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
31 |
(branch merge, don't forget to commit) |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
32 |
-- foo -- |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
33 |
line 0 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
34 |
line 1 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
35 |
line 2-1 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
36 |
-- bar -- |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
37 |
line 0 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
38 |
line 1 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
39 |
line 2-2 |