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-merge6.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 19 Apr 2006 08:33:46 -0700
changeset 2089 cb99c711c59f
parent 2019 ced2d3620f95
child 2175 b2ae81a7df29
permissions -rw-r--r--
make appendfile simpler so it does not break with revlogng on windows. it used to cache open files. this made revlogng break because it wants to rename files when splitting .i into .i/.d, but cannot rename or unlink open files on windows. new code is bit slower, but safe on linux and windows. proper fix for too many open/close of changelog/manifest belongs in different place. can get 10% speed improvement back.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     1
 
pulling from ../B1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     2
 
searching for changes
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     3
 
adding changesets
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     4
 
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset 
     5
 
adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 993
diff changeset 
     6
 
added 1 changesets with 1 changes to 1 files (+1 heads)
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1043
diff changeset 
     7
 
(run 'hg heads' to see heads, 'hg merge' to merge)
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     8
 
bar should remain deleted.
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset 
     9
 
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    10
 
pulling from ../A2
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    11
 
searching for changes
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    12
 
adding changesets
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    13
 
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset 
    14
 
adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 993
diff changeset 
    15
 
added 1 changesets with 0 changes to 0 files (+1 heads)
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1043
diff changeset 
    16
 
(run 'hg heads' to see heads, 'hg merge' to merge)
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    17
 
bar should remain deleted.
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents: 925
diff changeset 
    18
 
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
mercurial-crew-with-dirclash