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-conflict.out
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 29 Jul 2005 08:49:01 -0800
changeset 810 790a0ff306f2
parent 749 7e4843b7efd2
child 801 1f9ec150a476
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:
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     1
 
+ hg init
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     2
 
+ echo nothing
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     3
 
+ hg add a
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 748
diff changeset 
     4
 
+ hg commit -m ancestor -d '0 0'
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     5
 
+ echo something
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 748
diff changeset 
     6
 
+ hg commit -m branch1 -d '0 0'
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     7
 
+ hg co 0
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
     8
 
+ echo 'something else'
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 748
diff changeset 
     9
 
+ hg commit -m branch2 -d '0 0'
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    10
 
+ export HGMERGE=merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    11
 
+ HGMERGE=merge
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 392
diff changeset 
    12
 
+ hg up -m 1
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    13
 
merge: warning: conflicts during merge
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    14
 
merging a
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    15
 
merging a failed!
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    16
 
+ hg id
374
f07d00fcd281 update tests to reflect new short hash length
mpm@selenic.com
parents: 346
diff changeset 
    17
 
32e80765d7fe+75234512624c+ tip
392
ee4c80d294e5 Tidy up conflict and pull tests
mpm@selenic.com
parents: 377
diff changeset 
    18
 
+ grep -Ev '>>>|<<<' a
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    19
 
something else
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    20
 
=======
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    21
 
something
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    22
 
+ hg status
748
c5df1a9c5276 Update test output for status change
mpm@selenic.com
parents: 591
diff changeset 
    23
 
M a
346
f69a5d2d4fe1 merge3: fix argument order
mpm@selenic.com
parents:
diff changeset 
    24
 
? .out
mercurial-crew-with-dirclash