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 Bryan O'Sullivan <bos@serpentine.com>
Fri, 29 Jul 2005 08:49:01 -0800
changeset 810 790a0ff306f2
parent 775 122449dd89db
child 793 445970ccf57a
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rw-r--r--
Move commands.forget over to using new walk code. With no names, it now recursively forgets everything, as is the default behaviour of other commands. And prints the names of all files it hasn't specifically been told to forget.
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
 
+ cat
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     2
 
+ chmod +x merge
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     3
 
+ export HGMERGE=./merge
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     4
 
+ HGMERGE=./merge
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     5
 
+ mkdir A1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     6
 
+ cd A1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     7
 
+ hg init
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     8
 
+ echo This is file foo1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
     9
 
+ echo This is file bar1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    10
 
+ hg add foo bar
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 676
diff changeset 
    11
 
+ hg commit -m 'commit text' -d '0 0'
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    12
 
+ cd ..
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    13
 
+ hg clone A1 B1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    14
 
+ cd A1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    15
 
+ rm bar
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    16
 
+ hg remove bar
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 676
diff changeset 
    17
 
+ hg commit -m 'commit test' -d '0 0'
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    18
 
+ cd ../B1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    19
 
+ echo This is file foo22
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 676
diff changeset 
    20
 
+ hg commit -m 'commit test' -d '0 0'
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    21
 
+ cd ..
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    22
 
+ hg clone A1 A2
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    23
 
+ hg clone B1 B2
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    24
 
+ cd A1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    25
 
+ hg pull ../B1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    26
 
pulling from ../B1
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    27
 
searching for changes
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    28
 
adding changesets
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    29
 
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset 
    30
 
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset 
    31
 
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 
    32
 
(run 'hg update' to get a working copy)
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    33
 
+ hg update -m
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 676
diff changeset 
    34
 
+ hg commit -m 'commit test' -d '0 0'
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    35
 
+ echo bar should remain deleted.
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    36
 
bar should remain deleted.
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    37
 
+ hg manifest
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    38
 
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    39
 
+ cd ../B2
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    40
 
+ hg pull ../A2
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    41
 
pulling from ../A2
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    42
 
searching for changes
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    43
 
adding changesets
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    44
 
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset 
    45
 
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset 
    46
 
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 
    47
 
(run 'hg update' to get a working copy)
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    48
 
+ hg update -m
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 676
diff changeset 
    49
 
+ hg commit -m 'commit test' -d '0 0'
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    50
 
+ echo bar should remain deleted.
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    51
 
bar should remain deleted.
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    52
 
+ hg manifest
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents:
diff changeset 
    53
 
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
mercurial-crew-with-dirclash