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 Thomas Arendsen Hein <thomas@intevation.de>
Thu, 18 Aug 2005 13:55:45 +0100
changeset 950 fbaf0380efd1
parent 925 5a034646e472
child 990 5007e0bdeed2
permissions -rw-r--r--
Removed TODO from MANIFEST.in
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
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset 
     6
 
added 1 changesets with 1 changes to 1 files
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     7
 
(run 'hg update' to get a working copy)
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     8
 
bar should remain deleted.
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     9
 
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
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
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset 
    15
 
added 1 changesets with 0 changes to 0 files
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    16
 
(run 'hg update' to get a working copy)
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    17
 
bar should remain deleted.
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    18
 
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
mercurial-crew-with-dirclash