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-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 09 Aug 2005 11:32:30 +0100
changeset 861 cbe5c4d016b7
parent 839 9c918287d10b
child 925 5a034646e472
permissions -rw-r--r--
dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Interface is not yet changed. Non-regular files are considered to be removed or deleted. Removed the unneeded match(fn) call for adding to the unknown list.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset 
     1
 
+ hg init
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset 
     2
 
+ hg add a b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
     3
 
+ hg commit -m commit #0 -d 0 0
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
     4
 
+ hg commit -mcomment #1 -d 0 0
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset 
     5
 
+ hg update 0
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 767
diff changeset 
     6
 
+ hg commit -A -mcomment #2 -d 0 0
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset 
     7
 
removing b
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset 
     8
 
+ hg update 1
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset 
     9
 
this update spans a branch affecting the following files:
616
d45d1c90032e Fix zombie files in merge
maf46@burn.cl.cam.ac.uk
parents: 415
diff changeset 
    10
 
 b
415
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff changeset 
    11
 
aborting update spanning branches!
819
77e121a0d870 Update output for test-merge5.
Bryan O'Sullivan <bos@serpentine.com>
parents: 814
diff changeset 
    12
 
(use update -m to merge across branches or -C to lose changes)
mercurial-crew-with-dirclash