Mercurial > hg
changeset 12260:0a63e91c519d
tests: unify test-merge-remove
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Sun, 12 Sep 2010 12:11:39 +0200 |
| parents | 7b05cb9ac6d2 |
| children | fac20d9b7cf2 |
| files | tests/test-merge-remove tests/test-merge-remove.out tests/test-merge-remove.t |
| diffstat | 3 files changed, 87 insertions(+), 78 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge-remove Sun Sep 12 11:52:13 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -#!/bin/sh - -hg init repo -cd repo - -echo foo > foo -echo bar > bar -hg ci -qAm 'add foo bar' - -echo foo2 >> foo -echo bleh > bar -hg ci -m 'change foo bar' - -hg up -qC 0 -hg mv foo foo1 -echo foo1 > foo1 -hg cat foo >> foo1 -hg ci -m 'mv foo foo1' - -hg merge -hg debugstate --nodates -hg st -q - -echo '% removing foo1 and bar' -cp foo1 F -cp bar B -hg rm -f foo1 bar -hg debugstate --nodates -hg st -qC - -echo '% readding foo1 and bar' -cp F foo1 -cp B bar -hg add -v foo1 bar -hg debugstate --nodates -hg st -qC - -echo '% reverting foo1 and bar' -hg revert -vr . foo1 bar -hg debugstate --nodates -hg st -qC -hg diff -
--- a/tests/test-merge-remove.out Sun Sep 12 11:52:13 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -created new head -merging foo1 and foo to foo1 -1 files updated, 1 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) -n 0 -2 bar -m 644 14 foo1 -copy: foo -> foo1 -M bar -M foo1 -% removing foo1 and bar -r 0 -2 bar -r 0 -1 foo1 -copy: foo -> foo1 -R bar -R foo1 -% readding foo1 and bar -adding bar -adding foo1 -n 0 -2 bar -m 644 14 foo1 -copy: foo -> foo1 -M bar -M foo1 - foo -% reverting foo1 and bar -saving current version of bar as bar.orig -reverting bar -saving current version of foo1 as foo1.orig -reverting foo1 -n 0 -2 bar -m 644 14 foo1 -copy: foo -> foo1 -M bar -M foo1 - foo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-remove.t Sun Sep 12 12:11:39 2010 +0200 @@ -0,0 +1,87 @@ + $ hg init + + $ echo foo > foo + $ echo bar > bar + $ hg ci -qAm 'add foo bar' + + $ echo foo2 >> foo + $ echo bleh > bar + $ hg ci -m 'change foo bar' + + $ hg up -qC 0 + $ hg mv foo foo1 + $ echo foo1 > foo1 + $ hg cat foo >> foo1 + $ hg ci -m 'mv foo foo1' + created new head + + $ hg merge + merging foo1 and foo to foo1 + 1 files updated, 1 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + + $ hg debugstate --nodates + n 0 -2 bar + m 644 14 foo1 + copy: foo -> foo1 + + $ hg st -q + M bar + M foo1 + + +Removing foo1 and bar: + + $ cp foo1 F + $ cp bar B + $ hg rm -f foo1 bar + + $ hg debugstate --nodates + r 0 -2 bar + r 0 -1 foo1 + copy: foo -> foo1 + + $ hg st -qC + R bar + R foo1 + + +Re-adding foo1 and bar: + + $ cp F foo1 + $ cp B bar + $ hg add -v foo1 bar + adding bar + adding foo1 + + $ hg debugstate --nodates + n 0 -2 bar + m 644 14 foo1 + copy: foo -> foo1 + + $ hg st -qC + M bar + M foo1 + foo + + +Reverting foo1 and bar: + + $ hg revert -vr . foo1 bar + saving current version of bar as bar.orig + reverting bar + saving current version of foo1 as foo1.orig + reverting foo1 + + $ hg debugstate --nodates + n 0 -2 bar + m 644 14 foo1 + copy: foo -> foo1 + + $ hg st -qC + M bar + M foo1 + foo + + $ hg diff +