mercurial-crew-with-dirclash: tests/test-merge4 annotate

annotate tests/test-merge4 @ 5197:55860a45bbf2

Enable demandimport only in scripts, not in importable modules (issue605) This way other applications can choose if and when they want this feature, because it might be problematic if those applications rely on ImportError.

author	Thomas Arendsen Hein <thomas@intevation.de>
date	Sat, 18 Aug 2007 11:37:08 +0200
parents	e506c14382fd
children

rev	line source
800 ec85f9e6f3b1 Don't use 'set -x', fix exports, sed and hexdump usage for Solaris. Thomas Arendsen Hein <thomas@intevation.de> parents: 749 diff changeset	1 #!/bin/sh
416 5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	2
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	3 hg init
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	4 echo This is file a1 > a
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	5 hg add a
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 814 diff changeset	6 hg commit -m "commit #0" -d "1000000 0"
416 5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	7 echo This is file b1 > b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	8 hg add b
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 814 diff changeset	9 hg commit -m "commit #1" -d "1000000 0"
416 5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	10 hg update 0
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	11 echo This is file c1 > c
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	12 hg add c
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 814 diff changeset	13 hg commit -m "commit #2" -d "1000000 0"
2283 e506c14382fd deprecate 'update -m'. use 'merge' instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1933 diff changeset	14 hg merge 1
416 5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	15 rm b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	16 echo This is file c22 > c
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 814 diff changeset	17 hg commit -m "commit #3" -d "1000000 0"