Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge2.out @ 765:1e31d97c3d70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Hack to fix missing '/' problem in URLs
author mpm@selenic.com
date Fri, 22 Jul 2005 20:07:14 -0500
parents 7e4843b7efd2
children 61ed30e82b27
line wrap: on
line source

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ rm b
+ hg update 0
+ echo This is file b2
+ hg add b
+ hg commit -m 'commit #2' -d '0 0'
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ rm b
+ hg update 0
+ echo This is file b2
+ hg commit -A -m 'commit #2' -d '0 0'
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ rm b
+ hg remove b
+ hg update 0
+ echo This is file b2
+ hg commit -A -m 'commit #2' -d '0 0'
+ cd ..
+ /bin/rm -rf t