Mercurial > hg
changeset 7822:1079e666e938
remove tests for long-gone imerge extension
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 04 Mar 2009 18:42:24 -0600 |
| parents | 9fe7e6acf525 |
| children | 11efa41037e2 |
| files | tests/test-imerge tests/test-imerge.out |
| diffstat | 2 files changed, 0 insertions(+), 152 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-imerge Wed Mar 04 13:06:16 2009 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -#!/bin/sh - -echo "[extensions]" >> $HGRCPATH -echo "imerge=" >> $HGRCPATH -HGMERGE=true -export HGMERGE - -hg init base -cd base - -echo foo > foo -echo bar > bar -hg ci -Am0 -d '0 0' - -hg mv foo foo2 -echo foo >> foo2 -hg ci -m1 -d '1 0' - -hg up -C 0 -echo bar >> foo -echo bar >> bar -hg ci -m2 -d '2 0' - -echo % start imerge -hg imerge - -cat foo2 -cat bar - -echo % status -v -hg -v imerge st - -echo % next -hg imerge next - -echo % resolve and unresolve -hg imerge resolve foo -hg -v imerge st -hg imerge unresolve foo -hg -v imerge st - -echo % merge next -hg --traceback imerge - -echo % unresolve -hg imerge unres foo - -echo % merge foo -hg imerge merge foo - -echo % save -echo foo > foo2 -hg imerge save ../savedmerge - -echo % merge auto -hg up -C 1 -hg --traceback imerge --auto -cat foo2 - -echo % load -hg up -C 0 -hg imerge --traceback load ../savedmerge -cat foo2 - -hg ci -m'merged' -d '3 0' -hg tip -v - -echo % nothing to merge -- tip -hg imerge - -hg up 0 -echo % nothing to merge -hg imerge - -cd .. -hg -q clone -r 0 base clone -cd clone -echo % load unknown parent -hg imerge load ../savedmerge - -exit 0
--- a/tests/test-imerge.out Wed Mar 04 13:06:16 2009 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -adding bar -adding foo -1 files updated, 0 files merged, 1 files removed, 0 files unresolved -created new head -% start imerge -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) -U foo -foo -bar -bar -bar -% status -v -merging e6da46716401 and 30d266f502e7 -U foo (foo2) -% next -foo -% resolve and unresolve -merging e6da46716401 and 30d266f502e7 -R foo (foo2) -all conflicts resolved -merging e6da46716401 and 30d266f502e7 -U foo (foo2) -% merge next -merging foo and foo2 -all conflicts resolved -% unresolve -% merge foo -merging foo and foo2 -all conflicts resolved -% save -% merge auto -2 files updated, 0 files merged, 0 files removed, 0 files unresolved -2 files updated, 0 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) -merging foo2 and foo -warning: conflicts during merge. -merging foo2 failed! -U foo2 -foo -<<<<<<< local -foo -======= -bar ->>>>>>> other -% load -2 files updated, 0 files merged, 1 files removed, 0 files unresolved -2 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) -R foo -all conflicts resolved -foo -changeset: 3:fa9a6defdcaf -tag: tip -parent: 2:e6da46716401 -parent: 1:30d266f502e7 -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -files: foo foo2 -description: -merged - - -% nothing to merge -- tip -abort: there is nothing to merge -2 files updated, 0 files merged, 1 files removed, 0 files unresolved -% nothing to merge -abort: there is nothing to merge - use "hg update" instead -% load unknown parent -abort: merge parent e6da46716401 not in repository